[yoda-svn] r435 - trunk/include/YODA

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Tue May  1 18:09:58 2012
New Revision: 435

Log:
gcc 4.7 fixes

Modified:
   trunk/include/YODA/Bin1D.h
   trunk/include/YODA/HistoBin1D.h
   trunk/include/YODA/HistoBin2D.h
   trunk/include/YODA/ProfileBin1D.h
   trunk/include/YODA/ProfileBin2D.h

Modified: trunk/include/YODA/Bin1D.h
==============================================================================
--- trunk/include/YODA/Bin1D.h	Tue May  1 17:28:58 2012	(r434)
+++ trunk/include/YODA/Bin1D.h	Tue May  1 18:09:58 2012	(r435)
@@ -6,6 +6,7 @@
 #ifndef YODA_Bin1D_h
 #define YODA_Bin1D_h
 
+#include "YODA/Utils/MathUtils.h"
 #include "YODA/Bin.h"
 #include "YODA/Dbn1D.h"
 #include <string>

Modified: trunk/include/YODA/HistoBin1D.h
==============================================================================
--- trunk/include/YODA/HistoBin1D.h	Tue May  1 17:28:58 2012	(r434)
+++ trunk/include/YODA/HistoBin1D.h	Tue May  1 18:09:58 2012	(r435)
@@ -28,13 +28,13 @@
 
     /// Init a new, empty bin with a pair of edges.
     HistoBin1D(double lowedge, double highedge)
-      : Bin1D(lowedge, highedge)
+      : Bin1D<Dbn1D>(lowedge, highedge)
     { }
 
 
     /// Init a new, empty bin with a pair of edges.
     HistoBin1D(const std::pair<double,double>& edges)
-      : Bin1D(edges)
+      : Bin1D<Dbn1D>(edges)
     { }
 
 
@@ -42,19 +42,19 @@
     ///
     /// Mainly intended for internal persistency use.
     HistoBin1D(double lowedge, double highedge, const Dbn1D& dbnx)
-      : Bin1D(lowedge, highedge, dbnx)
+      : Bin1D<Dbn1D>(lowedge, highedge, dbnx)
     { }
 
 
     /// Copy constructor
     HistoBin1D(const HistoBin1D& hb)
-      : Bin1D(hb)
+      : Bin1D<Dbn1D>(hb)
     { }
 
 
     /// Copy assignment
     HistoBin1D& operator = (const HistoBin1D& hb) {
-      Bin1D::operator=(hb);
+      Bin1D<Dbn1D>::operator=(hb);
       return *this;
     }
 

Modified: trunk/include/YODA/HistoBin2D.h
==============================================================================
--- trunk/include/YODA/HistoBin2D.h	Tue May  1 17:28:58 2012	(r434)
+++ trunk/include/YODA/HistoBin2D.h	Tue May  1 18:09:58 2012	(r435)
@@ -26,12 +26,12 @@
     /// Constructor accepting a set of extremal points of a bin
     HistoBin2D(double lowEdgeX, double highEdgeX,
                double lowEdgeY, double highEdgeY)
-      : Bin2D(lowEdgeX, lowEdgeY, highEdgeX, highEdgeY)
+      : Bin2D<Dbn2D>(lowEdgeX, lowEdgeY, highEdgeX, highEdgeY)
     { }
 
     /// Constructor accepting a set of all edges of a bin
     HistoBin2D(std::vector<std::pair<std::pair<double,double>, std::pair<double,double> > >& edges)
-      : Bin2D(edges)
+      : Bin2D<Dbn2D>(edges)
     { }
 
 
@@ -60,7 +60,7 @@
 
     /// A reset function
     void reset() {
-      Bin2D::reset();
+      Bin2D<Dbn2D>::reset();
     }
 
     //@}

Modified: trunk/include/YODA/ProfileBin1D.h
==============================================================================
--- trunk/include/YODA/ProfileBin1D.h	Tue May  1 17:28:58 2012	(r434)
+++ trunk/include/YODA/ProfileBin1D.h	Tue May  1 18:09:58 2012	(r435)
@@ -28,13 +28,13 @@
 
     /// Constructor giving bin low and high edges.
     ProfileBin1D(double lowedge, double highedge)
-      : Bin1D(lowedge, highedge)
+      : Bin1D<Dbn2D>(lowedge, highedge)
     { }
 
 
     /// Constructor giving bin low and high edges as a pair.
     ProfileBin1D(const std::pair<double,double>& edges)
-      : Bin1D(edges)
+      : Bin1D<Dbn2D>(edges)
     { }
 
 
@@ -42,19 +42,19 @@
     ///
     /// Mainly intended for internal persistency use.
     ProfileBin1D(double lowedge, double highedge, const Dbn2D& dbnxy)
-      : Bin1D(lowedge, highedge, dbnxy)
+      : Bin1D<Dbn2D>(lowedge, highedge, dbnxy)
     {  }
 
 
     /// Copy constructor
     ProfileBin1D(const ProfileBin1D& pb)
-      : Bin1D(pb)
+      : Bin1D<Dbn2D>(pb)
     { }
 
 
     /// Copy assignment
     ProfileBin1D& operator = (const ProfileBin1D& pb) {
-      Bin1D::operator=(pb);
+      Bin1D<Dbn2D>::operator=(pb);
       return *this;
     }
 

Modified: trunk/include/YODA/ProfileBin2D.h
==============================================================================
--- trunk/include/YODA/ProfileBin2D.h	Tue May  1 17:28:58 2012	(r434)
+++ trunk/include/YODA/ProfileBin2D.h	Tue May  1 18:09:58 2012	(r435)
@@ -23,27 +23,27 @@
 
     /// Constructor giving lowedgesX/Y
     ProfileBin2D(double lowX, double lowY, double highX, double highY)
-      : Bin2D(lowX, lowY, highX, highY)
+      : Bin2D<Dbn3D>(lowX, lowY, highX, highY)
     { }
 
     ProfileBin2D(const std::vector<std::pair<std::pair<double,double>,std::pair<double,double> > >& edges)
-      : Bin2D(edges)
+      : Bin2D<Dbn3D>(edges)
     { }
 
     /// Unpersisting constructor
     ProfileBin2D(double lowX, double lowY, double highX, double highY,
                  const Dbn3D& dbnxyz)
-      : Bin2D(lowX, lowY, highX, highY)
+      : Bin2D<Dbn3D>(lowX, lowY, highX, highY)
     { }
 
     /// Copy constructor
     ProfileBin2D(const ProfileBin2D& pb)
-      : Bin2D(pb)
+      : Bin2D<Dbn3D>(pb)
     { }
 
     /// Copy assignment
     ProfileBin2D& operator = (const ProfileBin2D& pb) {
-      Bin2D::operator=(pb);
+      Bin2D<Dbn3D>::operator=(pb);
       return *this;
     }