Import Geant4 10.7.0 source tree

2020-12-04 12:30:43 +01:00
parent 67ba86d073
commit dab42d2018
3770 changed files with 226369 additions and 286486 deletions
@@ -213,10 +213,10 @@ void Dicom2Run::Merge(const G4Run* aRun)

    Copy(fCollName, localRun->fCollName);
    Copy(fCollID, localRun->fCollID);
-    G4int ncopies = G4int(Copy(fRunMap, localRun->fRunMap));
+    std::size_t ncopies = Copy(fRunMap, localRun->fRunMap);
    // copy function returns the fRunMap size if all data is copied
    // so this loop isn't executed the first time around
-    for(G4int i = ncopies; i < G4int(fRunMap.size()); ++i)
+    for(std::size_t i = ncopies; i < fRunMap.size(); ++i)
        *fRunMap[i] += *localRun->fRunMap[i];
 }