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

[occt.git] / src / ShapeCustom / ShapeCustom_BSplineRestriction.cxx

diff --git a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
index 20d0b1a..5777a1e 100755 (executable)
--- a/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
+++ b/src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
@@ -594,8 +594,8 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo
     Abs(v1-VF) > Precision::PConfusion() || Abs(v2- VL) > Precision::PConfusion()) {
       /*if(aSurf->IsUPeriodic() ) {
       Standard_Real aDelta = (UL > UF ? UL - UF : UF - UL );
-      u1 = (aDelta > 2.*PI ? 0. : UF + ShapeAnalysis::AdjustByPeriod(UF,0.5*(UL+UF),2*PI)); 
-      u2 = (aDelta > 2.*PI ? 2.*PI : u1 + aDelta); 
+      u1 = (aDelta > 2.*M_PI ? 0. : UF + ShapeAnalysis::AdjustByPeriod(UF,0.5*(UL+UF),2*M_PI)); 
+      u2 = (aDelta > 2.*M_PI ? 2.*M_PI : u1 + aDelta); 
       }*/
       Standard_Boolean isTrim = Standard_False;
       if(!aSurf->IsUPeriodic() ) { //else {
@@ -605,8 +605,8 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo
       /*if(aSurf->IsVPeriodic()) {
 
       Standard_Real aDelta = (VL > VF ? VL - VF : VF - VL );
-      v1 = (aDelta > 2.*PI ? 0. : VF + ShapeAnalysis::AdjustByPeriod(VF,0.5*(UL+UF),2*PI)); ; 
-      v2 = (aDelta > 2.*PI ? 2.* PI : v1 + aDelta); 
+      v1 = (aDelta > 2.*M_PI ? 0. : VF + ShapeAnalysis::AdjustByPeriod(VF,0.5*(UL+UF),2*M_PI)); ; 
+      v2 = (aDelta > 2.*M_PI ? 2.* M_PI : v1 + aDelta); 
       }*/
       if(!aSurf->IsVPeriodic()) {//else 
         v1 = Max(v1,VF); v2 = Min(v2,VL);