Import Geant4 10.6.0 source tree

source/digits_hits/digits/include/G4DCofThisEvent.hh

@@ -79,7 +79,7 @@ class G4DCofThisEvent
       //  Returns the number of digi collections which are stored in this class
       // object.
   public:
-      inline G4int GetCapacity() const
+      inline size_t GetCapacity() const
       {
         return DC->size();
       }

source/digits_hits/digits/include/G4TDigiCollection.hh

@@ -94,7 +94,7 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
         return (std::vector<T*>*)theCollection;
       }
       //  Returns a collection vector.
-      inline G4int insert(T* aHit)
+      inline size_t insert(T* aHit)
       {
         if (!aDCAllocator_G4MT_TLS_()) aDCAllocator_G4MT_TLS_() = new G4Allocator<G4DigiCollection>;
         std::vector<T*>*theDigiCollection
@@ -104,7 +104,7 @@ template <class T> class G4TDigiCollection : public G4DigiCollection
       }
       //  Insert a digi object. Total number of digi objects stored in this
       // collection is returned.
-      inline G4int entries() const
+      inline size_t entries() const
       {
         if (!aDCAllocator_G4MT_TLS_()) aDCAllocator_G4MT_TLS_() = new G4Allocator<G4DigiCollection>;
         std::vector<T*>*theDigiCollection

source/digits_hits/digits/include/G4VDigiCollection.hh

@@ -59,10 +59,10 @@ class G4VDigiCollection
       G4String DMname;
 
   public:
-      inline G4String GetName()
-      { return collectionName; };
-      inline G4String GetDMname()
-      { return DMname; };
+      inline const G4String& GetName() const
+      { return collectionName; }
+      inline const G4String& GetDMname() const
+      { return DMname; }
 
   public:
       // GetDigi and GetSize are given a default implementation here so