Import Geant4 10.6.0 source tree

source/geometry/navigation/include/G4ParameterisedNavigation.icc

@@ -22,9 +22,6 @@
 // * use  in  resulting  scientific  publications,  and indicate your *
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-//
-//
-//
 // 
 // class G4ParameterisedNavigation Inline implementation
 //
@@ -34,8 +31,7 @@
 // IdentifyAndPlaceSolid
 // ********************************************************************
 //
-inline
-G4VSolid* G4ParameterisedNavigation::
+inline G4VSolid* G4ParameterisedNavigation::
 IdentifyAndPlaceSolid( G4int num,
                        G4VPhysicalVolume *apparentPhys, // PhysV or PhysT
                        G4VPVParameterisation *curParam  )
@@ -53,8 +49,7 @@ IdentifyAndPlaceSolid( G4int num,
 // ParamVoxelLocate
 // ********************************************************************
 //
-inline
-G4SmartVoxelNode*
+inline G4SmartVoxelNode*
 G4ParameterisedNavigation::ParamVoxelLocate( G4SmartVoxelHeader* pHead,
                                        const G4ThreeVector& localPoint )
 {
@@ -72,7 +67,7 @@ G4ParameterisedNavigation::ParamVoxelLocate( G4SmartVoxelHeader* pHead,
     EAxis targetHeaderAxis;
 
     targetHeaderAxis = pHead->GetAxis();
-    targetHeaderNoSlices = pHead->GetNoSlices();
+    targetHeaderNoSlices = G4int(pHead->GetNoSlices());
     targetHeaderMin = pHead->GetMinExtent();
     targetHeaderNodeWidth = (pHead->GetMaxExtent()-targetHeaderMin)
                           / targetHeaderNoSlices;
@@ -85,9 +80,9 @@ G4ParameterisedNavigation::ParamVoxelLocate( G4SmartVoxelHeader* pHead,
       targetNodeNo = 0;
     }
     else if ( targetNodeNo>=targetHeaderNoSlices )
-         {
-           targetNodeNo = targetHeaderNoSlices-1;
-         }
+    {
+      targetNodeNo = targetHeaderNoSlices-1;
+    }
     fVoxelAxis = targetHeaderAxis;
     fVoxelNoSlices = targetHeaderNoSlices;
     fVoxelSliceWidth = targetHeaderNodeWidth;