Import Geant4 1.1.0 source tree

2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
@@ -306,7 +306,7 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p ) const
  }
  else
  {
-     dist= min(fPtrSolidA->DistanceToOut(p),
+     dist= G4std::min(fPtrSolidA->DistanceToOut(p),
               fPtrSolidB->DistanceToIn(p) ) ; 
  }
  return dist;