Import Geant4 10.1.0 source tree

2016-06-10 12:08:39 +02:00
parent 286caacf06
commit c9b32a6c0a
5770 changed files with 1050949 additions and 367105 deletions
@@ -58,7 +58,7 @@ void G4StatDouble::fill(G4double value, G4double weight)
 {
  m_sum_wx  += value * weight;
  m_sum_wx2 += value * value * weight;
-  m_n++;
+  if(m_n < INT_MAX) { ++m_n; }
  m_sum_w   += weight;
  m_sum_w2  += weight * weight;

@@ -162,7 +162,7 @@ G4double G4StatDouble::rms(G4double ext_sum_w, G4int ext_n)
  return rms(m_sum_wx, m_sum_wx2, ext_sum_w, ext_n);
 }

-void G4StatDouble::add(G4StatDouble* ptr)
+void G4StatDouble::add(const G4StatDouble* ptr)
 {
  m_n       += ptr->n();
  m_sum_w   += ptr->sum_w();