Import Geant4 11.3.0 source tree

source/analysis/accumulables/include/G4MergeMode.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 
-// Author: Ivana Hrivnacova, 04/07/2012  (ivana@ipno.in2p3.fr)
+// Author: Ivana Hrivnacova, IJCLab IN2P3/CNRS, 04/07/2012
 
 #ifndef G4MergeMode_h
 #define G4MergeMode_h 1
@@ -58,18 +58,15 @@ G4MergeFunction<T> GetMergeFunction(G4MergeMode mergeMode)
 {
   switch ( mergeMode ) {
     case G4MergeMode::kAddition:
-      // return std::bind([](const T& x, const T& y) { return x + y; });
-      return [](const T& x, const T& y) { return x + y; };
+      return std::plus<T>();
 
     case G4MergeMode::kMultiplication:
-      return [](const T& x, const T& y) { return x * y; };
+      return std::multiplies<T>();
 
     case G4MergeMode::kMaximum:
-      // return std::bind([](const T& x, const T& y) { return std::max(x,y);});
       return [](const T& x, const T& y) { return std::max(x,y); };
 
     case G4MergeMode::kMinimum:
-      // return std::bind([](const T& x, const T& y) { return std::min(x,y);});
       return [](const T& x, const T& y) { return std::min(x,y); };
   }