[Rivet-svn] rivet: Workarounds for g++ 4.9 series.

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/205272b270c1
branches:  multiweight
changeset: 5642:205272b270c1
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Fri Dec 09 10:18:33 2016 +0000
description:
Workarounds for g++ 4.9 series.

diffs (truncated from 98 to 50 lines):

--- a/include/Rivet/AnalysisHandler.hh	Wed Dec 07 14:07:17 2016 +0000
+++ b/include/Rivet/AnalysisHandler.hh	Fri Dec 09 10:18:33 2016 +0000
@@ -68,7 +68,7 @@
         return _eventCounter->sumW();
     }
 
-    int numWeights() const {
+    size_t numWeights() const {
         return _weightNames.size();
     }
 
--- a/include/Rivet/Tools/RivetYODA.hh	Wed Dec 07 14:07:17 2016 +0000
+++ b/include/Rivet/Tools/RivetYODA.hh	Fri Dec 09 10:18:33 2016 +0000
@@ -198,7 +198,7 @@
     void fill( double x, double y, double weight=1.0, double fraction=1.0 ) {
         if ( std::isnan(x) ) throw YODA::RangeError("X is NaN");
         if ( std::isnan(y) ) throw YODA::RangeError("Y is NaN");
-        fills_.insert( { {x,y}, weight } );
+        fills_.insert( { YODA::Profile1D::FillType{x,y}, weight } );
     }
     void reset() { fills_.clear(); }
     const Fills<YODA::Profile1D> & fills() const { return fills_; }
@@ -217,7 +217,7 @@
     void fill( double x, double y, double weight=1.0, double fraction=1.0 ) {
         if ( std::isnan(x) ) throw YODA::RangeError("X is NaN");
         if ( std::isnan(y) ) throw YODA::RangeError("Y is NaN");
-        fills_.insert( {{x,y}, weight} );
+        fills_.insert( { YODA::Histo2D::FillType{x,y}, weight } );
     }
     void reset() { fills_.clear(); }
     const Fills<YODA::Histo2D> & fills() const { return fills_; }
@@ -236,7 +236,7 @@
         if ( std::isnan(x) ) throw YODA::RangeError("X is NaN");
         if ( std::isnan(y) ) throw YODA::RangeError("Y is NaN");
         if ( std::isnan(z) ) throw YODA::RangeError("Z is NaN");
-        fills_.insert( {{x,y,z}, weight} );
+        fills_.insert( { YODA::Profile2D::FillType{x,y,z}, weight } );
     }
     void reset() { fills_.clear(); }
     const Fills<YODA::Profile2D> & fills() const { return fills_; }
--- a/src/Core/AnalysisHandler.cc	Wed Dec 07 14:07:17 2016 +0000
+++ b/src/Core/AnalysisHandler.cc	Fri Dec 09 10:18:33 2016 +0000
@@ -18,7 +18,7 @@
             last;
         return {first, last};
     }
-};
+}