Import Geant4 10.6.0 source tree

source/event/include/G4TrajectoryContainer.hh

@@ -23,20 +23,17 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
-//
-//
-//
 // G4TrajectoryContainer
 //
 // Class description:
 //
 // This is a container of G4VTrajectory objects and the object of this
 // container will be associated to G4Event object.
-//
 
-// ********************************************************************
-#ifndef G4TrajectoryContainer_h
-#define G4TrajectoryContainer_h 1
+// Author: Makoto Asai (SLAC)
+// --------------------------------------------------------------------
+#ifndef G4TrajectoryContainer_hh
+#define G4TrajectoryContainer_hh 1
 
 #include <vector>
 
@@ -50,38 +47,38 @@ typedef std::vector<G4VTrajectory*> TrajectoryVector;
 class G4TrajectoryContainer
 {
   public:
+
     G4TrajectoryContainer();
     ~G4TrajectoryContainer();
 
-  private:
-    G4TrajectoryContainer(const G4TrajectoryContainer&);
-    G4TrajectoryContainer& operator=(const G4TrajectoryContainer&);
+    G4TrajectoryContainer(const G4TrajectoryContainer&) = delete;
+    G4TrajectoryContainer& operator=(const G4TrajectoryContainer&) = delete;
 
-  public:
     inline void *operator new(size_t);
     inline void operator delete(void* anEvent);
 
     G4bool operator==(const G4TrajectoryContainer& right) const;
     G4bool operator!=(const G4TrajectoryContainer& right) const;
 
-  public:
     inline size_t size() const { return vect->size(); }
     inline void push_back(G4VTrajectory* p) { vect->push_back(p); }
-    inline G4int entries() const { return size(); }
+    inline size_t entries() const { return size(); }
     inline G4bool insert(G4VTrajectory* p) { push_back(p); return true; }
     inline void clearAndDestroy()
     {
-      for(size_t i=0;i<size();i++) delete (*vect)[i];
+      for(std::size_t i=0; i<size(); ++i) delete (*vect)[i];
       vect->clear();
     }
     inline G4VTrajectory* operator[](size_t n) { return (*vect)[n]; }
     inline TrajectoryVector* GetVector() const { return vect; }
 
   private:
+
     TrajectoryVector* vect;
 };
 
-extern G4EVENT_DLL G4Allocator<G4TrajectoryContainer>*& aTrajectoryContainerAllocator();
+extern G4EVENT_DLL
+G4Allocator<G4TrajectoryContainer>*& aTrajectoryContainerAllocator();
 
 inline void* G4TrajectoryContainer::operator new(size_t)
 {
@@ -92,7 +89,8 @@ inline void* G4TrajectoryContainer::operator new(size_t)
 
 inline void G4TrajectoryContainer::operator delete(void* aTrajectoryContainer)
 {
-  aTrajectoryContainerAllocator()->FreeSingle((G4TrajectoryContainer*)aTrajectoryContainer);
+  aTrajectoryContainerAllocator()
+   ->FreeSingle((G4TrajectoryContainer*)aTrajectoryContainer);
 }
 
 #endif