1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00

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

This commit is contained in:
DBV
2011-12-16 08:50:03 +00:00
committed by bugmaster
parent bc650d4170
commit c6541a0c86
438 changed files with 2142 additions and 2188 deletions

View File

@@ -104,7 +104,7 @@ void IntTools_TopolTool::ComputeSamplePoints()
break;
case GeomAbs_Cylinder: {
Standard_Real aRadius = myS->Cylinder().Radius();
Standard_Real aMaxAngle = Standard_PI * 0.5;
Standard_Real aMaxAngle = M_PI * 0.5;
Standard_Real aDeflection = 1.e-02;
if(aRadius > aDeflection) {
@@ -133,7 +133,7 @@ void IntTools_TopolTool::ComputeSamplePoints()
if(aRadius < aCircle.Radius())
aRadius = aCircle.Radius();
Standard_Real aMaxAngle = Standard_PI * 0.5;
Standard_Real aMaxAngle = M_PI * 0.5;
Standard_Real aDeflection = 1.e-02;
if(aRadius > aDeflection) {
@@ -177,7 +177,7 @@ void IntTools_TopolTool::ComputeSamplePoints()
aRadius1 = aSphere.Radius();
aRadius2 = aSphere.Radius();
}
Standard_Real aMaxAngle = Standard_PI * 0.5;
Standard_Real aMaxAngle = M_PI * 0.5;
Standard_Real aDeflection = 1.e-02;
if(aRadius1 > aDeflection) {
@@ -187,7 +187,7 @@ void IntTools_TopolTool::ComputeSamplePoints()
if(aMaxAngle > Precision::Angular()) {
nbsu = Standard_Integer((usup - uinf) / aMaxAngle);
}
aMaxAngle = Standard_PI * 0.5;
aMaxAngle = M_PI * 0.5;
if(aRadius2 > aDeflection) {
aMaxAngle = ACos(1. - aDeflection / aRadius2) * 2.;