Import Geant4 10.6.0 source tree

source/analysis/accumulables/include/G4AccumulableManager.icc

@@ -104,7 +104,7 @@ G4AccumulableManager::GetAccumulable(G4int id, G4bool warn) const
 //_____________________________________________________________________________
 inline G4int G4AccumulableManager::GetNofAccumulables() const
 {
-  return fVector.size();
+  return G4int(fVector.size());
 }
 
 //_____________________________________________________________________________

source/analysis/accumulables/include/G4MergeMode.hh

@@ -70,6 +70,9 @@ G4MergeFunction<T> GetMergeFunction(G4MergeMode mergeMode)
     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); };
+
+    default:
+      return [](const T&, const T&) { return 0.0; };
   }
 }