Import Geant4 10.4.0 source tree

2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
@@ -17,7 +17,8 @@ class b1 : public base_histo<TC,TO,TN,TW,TH> {
 protected:
  enum {AxisX=0};
 public:
-  typedef histo::axis<TC,TO> axis_t;
+  typedef base_histo<TC,TO,TN,TW,TH> base_histo_t;
+  typedef typename parent::axis_t axis_t;
  typedef typename parent::bn_t bn_t;
 public:
  virtual TH bin_error(int) const = 0; //for print
@@ -166,7 +167,11 @@ protected:
  virtual ~b1(){}
 protected:
  b1(const b1& a_from):parent(a_from){}
-  b1& operator=(const b1& a_from) {parent::operator=(a_from);return *this;}
+  b1& operator=(const b1& a_from) {
+    if(&a_from==this) return *this;
+    parent::operator=(a_from);
+    return *this;
+  }
 public:
  bool configure(bn_t aXnumber,TC aXmin,TC aXmax){
    std::vector<bn_t> nbins;