Changeset 1337 for trunk/source/geometry/solids/specific/src/G4GenericTrap.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/source/geometry/solids/specific/src/G4GenericTrap.cc (modified) (7 diffs)

trunk/source/geometry/solids/specific/src/G4GenericTrap.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4GenericTrap.cc,v 1.12 2010/06/11 09:42:28 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
+// $Id: G4GenericTrap.cc,v 1.13 2010/06/25 09:41:07 gunter Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //
@@ -206 +206 @@
   if(count==4)
   { 
-    if ( (fabs(p.x()-poly[0].x())+fabs(p.y()-poly[0].y())) > halfCarTolerance )
+    if ( (std::fabs(p.x()-poly[0].x())+std::fabs(p.y()-poly[0].y())) > halfCarTolerance )
     {
       in=kOutside;
@@ -316 +316 @@
     if ( (p2-p0).mag2() < kCarTolerance )
     {
-      if ( fabs(p.z()+fDz) > kCarTolerance )
+      if ( std::fabs(p.z()+fDz) > kCarTolerance )
       {
         p2=G4ThreeVector(fVertices[(s+1)%4].x(),fVertices[(s+1)%4].y(),-fDz);
@@ -430 +430 @@
   if ( (p2-p0).mag2() < kCarTolerance )
   {
-    if ( fabs(p.z()+fDz) > halfCarTolerance )
+    if ( std::fabs(p.z()+fDz) > halfCarTolerance )
     {
       p2=G4ThreeVector(fVertices[j].x(),fVertices[j].y(),-fDz);
@@ -756 +756 @@
   G4double zac=0;
   
-  if ( (fabs(xa-xc)+fabs(ya-yc)) < halfCarTolerance )
+  if ( (std::fabs(xa-xc)+std::fabs(ya-yc)) < halfCarTolerance )
   {
     xc=fVertices[j+4].x();
@@ -765 +765 @@
     //Line case
     //
-    if ( (fabs(xb-xc)+fabs(yb-yc)) < halfCarTolerance )
+    if ( (std::fabs(xb-xc)+std::fabs(yb-yc)) < halfCarTolerance )
     {
       return kInfinity;
@@ -850 +850 @@
     yd=fVertices[4+j].y();
 
-    if ( ((fabs(xb-xd)+fabs(yb-yd))<halfCarTolerance)
-      || ((fabs(xa-xc)+fabs(ya-yc))<halfCarTolerance) )
+    if ( ((std::fabs(xb-xd)+std::fabs(yb-yd))<halfCarTolerance)
+      || ((std::fabs(xa-xc)+std::fabs(ya-yc))<halfCarTolerance) )
     {
       G4double s=DistToTriangle(p,v,ipl) ;