Import Geant4 10.5.1 source tree

source/geometry/volumes/src/G4AssemblyVolume.cc

@@ -101,7 +101,7 @@ G4AssemblyVolume::~G4AssemblyVolume()
   unsigned int howmany = fTriplets.size();
   if( howmany != 0 )
   {
-    for( unsigned int i = 0; i < howmany; i++ )
+    for( unsigned int i = 0; i < howmany; ++i )
     {
       G4RotationMatrix* pRotToClean = fTriplets[i].GetRotation();
       if( pRotToClean != 0 )
@@ -112,14 +112,9 @@ G4AssemblyVolume::~G4AssemblyVolume()
   }
   fTriplets.clear();
   
-  howmany = fPVStore.size();
-  if( howmany != 0 )
-  {
-    for( unsigned int j = 0; j < howmany; j++ )
-    {
-      delete fPVStore[j];
-    }
-  }
+  // No need to delete physical volumes, as these are deleted
+  // by physical-volumes store.
+  //
   fPVStore.clear();
   InstanceCountMinus();
   G4AssemblyStore::GetInstance()->DeRegister(this);

source/geometry/volumes/src/G4LogicalBorderSurface.cc

@@ -102,13 +102,13 @@ G4LogicalBorderSurface::operator=(const G4LogicalBorderSurface &right)
   return *this;
 }
 
-G4int
+G4bool
 G4LogicalBorderSurface::operator==(const G4LogicalBorderSurface &right) const
 {
   return (this == (G4LogicalBorderSurface *) &right);
 }
 
-G4int
+G4bool
 G4LogicalBorderSurface::operator!=(const G4LogicalBorderSurface &right) const
 {
   return (this != (G4LogicalBorderSurface *) &right);

source/geometry/volumes/src/G4LogicalSkinSurface.cc

@@ -96,13 +96,13 @@ G4LogicalSkinSurface::operator=(const G4LogicalSkinSurface& right)
   return *this;
 }
 
-G4int
+G4bool
 G4LogicalSkinSurface::operator==(const G4LogicalSkinSurface& right) const
 {
   return (this == (G4LogicalSkinSurface *) &right);
 }
 
-G4int
+G4bool
 G4LogicalSkinSurface::operator!=(const G4LogicalSkinSurface& right) const
 {
   return (this != (G4LogicalSkinSurface *) &right);