Import Geant4 11.1.0 source tree

source/persistency/mctruth/src/G4MCTEvent.cc

@@ -87,7 +87,7 @@ G4int G4MCTEvent::AddPrimaryPair(const G4MCTGenParticle& genp,
   sim2genParticleMap.insert(std::make_pair(
     const_cast<G4MCTSimParticle*>(simp), const_cast<G4MCTGenParticle&>(genp)));
 
-  return gen2simParticleMap.size();
+  return (G4int)gen2simParticleMap.size();
 }
 
 // --------------------------------------------------------------------

source/persistency/mctruth/src/G4MCTGenEvent.cc

@@ -45,19 +45,19 @@ G4MCTGenEvent::~G4MCTGenEvent()
 G4int G4MCTGenEvent::AddGenEvent(const void* genevent)
 {
   eventList.push_back(const_cast<void*>(genevent));
-  return eventList.size();
+  return (G4int)eventList.size();
 }
 
 // --------------------------------------------------------------------
 G4int G4MCTGenEvent::GetNofEvents() const
 {
-  return eventList.size();
+  return (G4int)eventList.size();
 }
 
 // --------------------------------------------------------------------
 const void* G4MCTGenEvent::GetGenEvent(G4int i)
 {
-  G4int size = eventList.size();
+  G4int size = (G4int)eventList.size();
   if(i >= 0 && i < size)
     return eventList[i];
   else

source/persistency/mctruth/src/G4MCTSimEvent.cc

@@ -50,7 +50,7 @@ G4bool G4MCTSimEvent::AddParticle(const G4MCTSimParticle* aparticle)
 {
   G4MCTSimParticle* qpart = const_cast<G4MCTSimParticle*>(aparticle);
   G4int trackID           = aparticle->GetTrackID();
-  G4int nc                = particleMap.count(trackID);
+  std::size_t nc          = particleMap.count(trackID);
   if(nc == 0)
   {
     particleMap.insert(std::make_pair(trackID, qpart));
@@ -79,7 +79,7 @@ G4MCTSimParticle* G4MCTSimEvent::FindParticle(G4int tid) const
 // --------------------------------------------------------------------
 G4MCTSimVertex* G4MCTSimEvent::GetVertex(G4int vid) const
 {
-  G4int nv = vertexVec.size();
+  G4int nv = (G4int)vertexVec.size();
   if(vid >= 1 && vid <= nv)
   {
     return vertexVec[vid - 1];

source/persistency/mctruth/src/G4MCTSimParticle.cc

@@ -80,19 +80,19 @@ G4int G4MCTSimParticle::AssociateParticle(G4MCTSimParticle* p)
 {
   associatedParticleList.push_back(p);
   p->SetParentParticle(this);
-  return associatedParticleList.size();
+  return (G4int)associatedParticleList.size();
 }
 
 // --------------------------------------------------------------------
 G4int G4MCTSimParticle::GetNofAssociatedParticles() const
 {
-  return associatedParticleList.size();
+  return (G4int)associatedParticleList.size();
 }
 
 // --------------------------------------------------------------------
 G4MCTSimParticle* G4MCTSimParticle::GetAssociatedParticle(G4int i) const
 {
-  G4int size = associatedParticleList.size();
+  G4int size = (G4int)associatedParticleList.size();
   if(i >= 0 && i < size)
     return associatedParticleList[i];
   else

source/persistency/mctruth/src/G4PersistencyCenterMessenger.cc

@@ -269,8 +269,8 @@ G4String G4PersistencyCenterMessenger::PopWord(const G4String& text, G4int n,
 {
   if(text.length() <= 0)
     return "";
-  G4int p = 0, p0 = 0;
-  G4int p1 = 0;
+  std::size_t p = 0, p0 = 0;
+  std::size_t p1 = 0;
   for(G4int i = 0; i < n; ++i)
   {
     p1 = text.find_first_of(delim, p0 + 1);
@@ -280,7 +280,7 @@ G4String G4PersistencyCenterMessenger::PopWord(const G4String& text, G4int n,
       p1 = text.find_first_of(delim, p0 + 1);
     }
     p = p0;
-    if(p1 < 0)
+    if(p1 == G4String::npos)
     {
       if(i + 1 < n)
         return "";

source/persistency/mctruth/src/G4PersistencyManager.cc

@@ -74,13 +74,13 @@ void G4PersistencyManager::SetVerboseLevel(G4int v)
   if(TransactionManager() != nullptr)
     TransactionManager()->SetVerboseLevel(m_verbose);
 
-  std::size_t i;
+  G4int i;
 
   G4HCIOcatalog* hcio = G4HCIOcatalog::GetHCIOcatalog();
   if(hcio != nullptr)
   {
     hcio->SetVerboseLevel(m_verbose);
-    for(i = 0; i < hcio->NumberOfHCIOmanager(); ++i)
+    for(i = 0; i < (G4int)hcio->NumberOfHCIOmanager(); ++i)
     {
       hcio->GetHCIOmanager(i)->SetVerboseLevel(m_verbose);
     }
@@ -89,7 +89,7 @@ void G4PersistencyManager::SetVerboseLevel(G4int v)
   if(dcio != nullptr)
   {
     dcio->SetVerboseLevel(m_verbose);
-    for(i = 0; i < dcio->NumberOfDCIOmanager(); ++i)
+    for(i = 0; i < (G4int)dcio->NumberOfDCIOmanager(); ++i)
     {
       dcio->GetDCIOmanager(i)->SetVerboseLevel(m_verbose);
     }

source/persistency/mctruth/src/G4VPDigitIO.cc

@@ -44,7 +44,7 @@ void G4VPDigitIO::SetVerboseLevel(G4int v)
   m_verbose = v;
 
   // Loop through the registered Digit I/O managers
-  for(std::size_t i = 0; i < f_catalog->NumberOfDCIOmanager(); ++i)
+  for(G4int i = 0; i < (G4int)f_catalog->NumberOfDCIOmanager(); ++i)
   {
     G4VPDigitsCollectionIO* digitIOman = f_catalog->GetDCIOmanager(i);
     digitIOman->SetVerboseLevel(v);

source/persistency/mctruth/src/G4VPHitIO.cc

@@ -44,7 +44,7 @@ void G4VPHitIO::SetVerboseLevel(G4int v)
   m_verbose = v;
 
   // Loop through the registered Hit I/O managers
-  for(std::size_t i = 0; i < f_catalog->NumberOfHCIOmanager(); ++i)
+  for(G4int i = 0; i < (G4int)f_catalog->NumberOfHCIOmanager(); ++i)
   {
     G4VPHitsCollectionIO* hitIOman = f_catalog->GetHCIOmanager(i);
     hitIOman->SetVerboseLevel(v);