0022792: Globally defined symbol PI conflicts with VTK definition (Intel compiler)

[occt.git] / src / AIS / AIS_IdenticRelation.cxx

diff --git a/src/AIS/AIS_IdenticRelation.cxx b/src/AIS/AIS_IdenticRelation.cxx
index 9c5b3d8..c5ebc28 100755 (executable)
--- a/src/AIS/AIS_IdenticRelation.cxx
+++ b/src/AIS/AIS_IdenticRelation.cxx
@@ -58,8 +58,8 @@
 
 static Standard_Real Modulo2PI(const Standard_Real ANGLE)
 {
-  if ( ANGLE < 0 )          return Modulo2PI(ANGLE + 2*PI);
-  else if ( ANGLE >= 2*PI ) return Modulo2PI(ANGLE - 2*PI);
+  if ( ANGLE < 0 )          return Modulo2PI(ANGLE + 2*M_PI);
+  else if ( ANGLE >= 2*M_PI ) return Modulo2PI(ANGLE - 2*M_PI);
   return ANGLE;
 }
 
@@ -68,7 +68,7 @@ static Standard_Boolean IsEqual2PI(const Standard_Real angle1,
 {
   Standard_Real diff = Abs(angle1-angle2);
   if ( diff < precision )                return Standard_True;
-  else if ( Abs(diff-2*PI) < precision ) return Standard_True;
+  else if ( Abs(diff-2*M_PI) < precision ) return Standard_True;
   return Standard_False;
 }
 // jfa 15/10/2000 end
@@ -187,18 +187,18 @@ static Standard_Boolean ComputeAttach(const gp_Circ& thecirc,
   Standard_Real deltap = pSAttachM - pFAttach;
   if ( deltap < 0 )
     {
-      deltap += 2*Standard_PI;
-      pSAttachM += 2*Standard_PI;
+      deltap += 2 * M_PI;
+      pSAttachM += 2 * M_PI;
     }
   pSAttachM -= pFAttach;
 
-  Standard_Real pmiddleout = pSAttachM/2.0 + Standard_PI;
+  Standard_Real pmiddleout = pSAttachM/2.0 + M_PI;
 
   Standard_Real pcurpos1 = pcurpos;
   // define where curpos lays
   if ( pcurpos1 < pFAttach )
     {
-      pcurpos1 = pcurpos1 + 2*Standard_PI - pFAttach;
+      pcurpos1 = pcurpos1 + 2 * M_PI - pFAttach;
       if ( pcurpos1 > pSAttachM ) // out
        {
          if ( pcurpos1 > pmiddleout ) pcurpos = pFAttach;
@@ -255,18 +255,18 @@ static Standard_Boolean ComputeAttach(const gp_Elips& theEll,
   Standard_Real deltap = pSAttachM - pFAttach;
   if ( deltap < 0 )
     {
-      deltap += 2*Standard_PI;
-      pSAttachM += 2*Standard_PI;
+      deltap += 2 * M_PI;
+      pSAttachM += 2 * M_PI;
     }
   pSAttachM -= pFAttach;
 
-  Standard_Real pmiddleout = pSAttachM/2.0 + Standard_PI;
+  Standard_Real pmiddleout = pSAttachM/2.0 + M_PI;
 
   Standard_Real pcurpos1 = pcurpos;
   // define where curpos lays
   if ( pcurpos1 < pFAttach )
     {
-      pcurpos1 = pcurpos1 + 2*Standard_PI - pFAttach;
+      pcurpos1 = pcurpos1 + 2 * M_PI - pFAttach;
       if ( pcurpos1 > pSAttachM ) // out
        {
          if ( pcurpos1 > pmiddleout ) pcurpos = pFAttach;
@@ -746,7 +746,7 @@ void AIS_IdenticRelation::ComputeTwoCirclesPresentation(const Handle(Prs3d_Prese
     
   myCenter = thecirc->Location();
   Standard_Real aSegSize = thecirc->Radius()/5.0;
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
     
   // I. Case of 2 complete circles
   if ( circ1complete && circ2complete )
@@ -984,7 +984,7 @@ void AIS_IdenticRelation::ComputeAutoArcPresentation(const Handle(Geom_Circle)&
                                                     const Standard_Boolean isstatic)
 {
   Standard_Real aSegSize = thecirc->Radius()/5.0;
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
 
   Standard_Real pFA = ElCLib::Parameter(thecirc->Circ(),firstp);
   Standard_Real pSA = ElCLib::Parameter(thecirc->Circ(),lastp);
@@ -1027,7 +1027,7 @@ void AIS_IdenticRelation::ComputeNotAutoCircPresentation(const Handle(Geom_Circl
       curpos.Translate(vprec*1e-5);
     }
   
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
   Standard_Real pcurpos = ElCLib::Parameter(cirNotAuto->Circ(),curpos);
   Standard_Real pFAttach = pcurpos - rad;
   Standard_Real pSAttach = pcurpos + rad;
@@ -1055,7 +1055,7 @@ void AIS_IdenticRelation::ComputeNotAutoArcPresentation(const Handle(Geom_Circle
   Standard_Real pSPnt = ElCLib::Parameter(cirNotAuto, pntlast);
   Standard_Real deltap = Modulo2PI(pSPnt - pFPnt)/2.0;
 
-  Standard_Real rad = Standard_PI/5;
+  Standard_Real rad = M_PI / 5;
   if ( deltap < rad )
     {
       myFAttach = pntfirst;
@@ -1101,7 +1101,7 @@ void AIS_IdenticRelation::ComputeTwoEllipsesPresentation(const Handle(Prs3d_Pres
     
   myCenter = theEll->Location();
   Standard_Real aSegSize = theEll->MajorRadius()/5.0;
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
     
   // I. Case of 2 complete ellipses
   if ( circ1complete && circ2complete )
@@ -1338,7 +1338,7 @@ void AIS_IdenticRelation::ComputeAutoArcPresentation(const Handle(Geom_Ellipse)&
                                                     const Standard_Boolean isstatic)
 {
   Standard_Real aSegSize = theEll->MajorRadius()/5.0;
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
 
   gp_Elips anEll = theEll->Elips();
   
@@ -1383,7 +1383,7 @@ void AIS_IdenticRelation::ComputeNotAutoElipsPresentation(const Handle(Geom_Elli
       curpos.Translate(vprec*1e-5);
     }
   
-  Standard_Real rad = Standard_PI/5.0;
+  Standard_Real rad = M_PI / 5.0;
 //  Standard_Real pcurpos = ElCLib::Parameter(anEll,curpos);
   GeomAPI_ProjectPointOnCurve aProj (curpos, theEll);
   Standard_Real pcurpos  = aProj.LowerDistanceParameter();
@@ -1414,7 +1414,7 @@ void AIS_IdenticRelation::ComputeNotAutoArcPresentation(const Handle(Geom_Ellips
   Standard_Real pSPnt = ElCLib::Parameter(anEll, pntlast);
   Standard_Real deltap = Modulo2PI(pSPnt - pFPnt)/2.0;
 
-  Standard_Real rad = Standard_PI/5;
+  Standard_Real rad = M_PI / 5;
   if ( deltap < rad )
     {
       myFAttach = pntfirst;