Import Geant4 10.6.0 source tree

source/geometry/management/include/G4GeomSplitter.hh

@@ -22,11 +22,8 @@
 // * use  in  resulting  scientific  publications,  and indicate your *
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-//
-//
-//
 // 
-// class G4LogicalVolume
+// G4GeomSplitter
 //
 // Class description:
 //
@@ -34,8 +31,7 @@
 // classes: G4LogicalVolume, G4Region, G4VPhysicalVolume, G4PolyconeSide
 // G4PolyhedraSide, G4PVReplica. 
 
-// Author:
-// 01.25.09 X.Dong: Initial version from automatic MT conversion.
+// Author: X.Dong - Initial version from automatic MT conversion, 01.25.09.
 // ------------------------------------------------------------------------
 #ifndef G4GEOMSPLITTER_HH
 #define G4GEOMSPLITTER_HH
@@ -50,7 +46,7 @@ class G4GeomSplitter
   public:
 
     G4GeomSplitter()
-      : totalobj(0), totalspace(0), sharedOffset(0)
+      : totalobj(0), totalspace(0), sharedOffset(nullptr)
     {
       G4MUTEXINIT(mutex);
     }
@@ -66,11 +62,11 @@ class G4GeomSplitter
       // whenever a new split class instance is created.
     {
       G4AutoLock l(&mutex);
-      totalobj++;
+      ++totalobj;
       if (totalobj > totalspace)
       {
         offset = Reallocate(totalspace+512);
-        if (offset == 0)
+        if (offset == nullptr)
         {
            G4Exception("G4GeomSPlitter::CreateSubInstance()",
                        "OutOfMemory", FatalException, "Cannot malloc space!");
@@ -91,9 +87,9 @@ class G4GeomSplitter
       // from the master thread.
     {
       G4AutoLock l(&mutex);
-      if (offset)  { return; }
+      if (offset != nullptr)  { return; }
       offset = Reallocate(totalspace);
-      if (offset == 0)
+      if (offset == nullptr)
       {
         G4Exception("G4GeomSplitter::SlaveCopySubInstanceArray()",
                     "OutOfMemory", FatalException, "Cannot malloc space!");
@@ -108,10 +104,10 @@ class G4GeomSplitter
       // the subclass.
     {
       G4AutoLock l(&mutex);
-      if (offset)  { return; }
+      if (offset != nullptr)  { return; }
       offset = Reallocate(totalspace);
 
-      if (offset == 0)
+      if (offset == nullptr)
       {
         G4Exception("G4GeomSplitter::SlaveInitializeSubInstance()",
                     "OutOfMemory", FatalException, "Cannot malloc space!");
@@ -129,7 +125,7 @@ class G4GeomSplitter
       // To cope with user's changes in Geometry - e.g. change of material
       // in a volume
     {
-      if (!offset)
+      if (offset == nullptr)
       {
         SlaveInitializeSubInstance();
         G4Exception("G4GeomSPlitter::SlaveReCopySubInstance()",
@@ -142,9 +138,9 @@ class G4GeomSplitter
     void FreeSlave()
       // Invoked by all threads to free the subinstance array.
     {
-      if (!offset)  { return; }
+      if (offset == nullptr)  { return; }
       std::free( offset );
-      offset = 0;
+      offset = nullptr;
     }
 
     // Extension - to allow sharing of workspaces
@@ -154,7 +150,7 @@ class G4GeomSplitter
     void UseWorkArea( T* newOffset )
       // Use recycled work area - which was created previously
     {
-      if( offset && offset!=newOffset )
+      if( (offset!=nullptr) && (offset!=newOffset) )
       {
          G4Exception("G4GeomSplitter::UseWorkspace()", 
                      "TwoWorkspaces", FatalException,
@@ -168,7 +164,7 @@ class G4GeomSplitter
       // The object which calls this method is responsible for it.
     {
       T* offsetRet = offset;
-      offset = 0;
+      offset = nullptr;
       return offsetRet;
     }
 
@@ -184,6 +180,6 @@ class G4GeomSplitter
     G4Mutex mutex;
 };
 
-template <typename T> G4ThreadLocal T* G4GeomSplitter<T>::offset = 0;
+template <typename T> G4ThreadLocal T* G4GeomSplitter<T>::offset = nullptr;
 
 #endif