OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-08 14:17:06 +03:00
Code Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/IGESGeom/IGESGeom_CircularArc.cxx
View File

@@ -99,7 +99,7 @@
gp_Dir2d dir2(x2-xc, y2-yc); // After shifting the centre of
// arc to the origin
Standard_Real t = dir1.Angle(dir2);
return t + (t > 0 ? 0 : 2*PI);
return t + (t > 0 ? 0 : 2*M_PI);
}
gp_Dir IGESGeom_CircularArc::Axis () const

4
src/IGESGeom/IGESGeom_ConicArc.cxx
View File

@@ -219,9 +219,9 @@
Xcen = ( cc*ee + f*b) / dn;
Ycen = (-cc*dd - f*a) / dn;
Standard_Real teta = PI/2.;
Standard_Real teta = M_PI/2.;
if (Abs(b) > eps) teta = ATan (-a/b);
if (fc < 0) teta += PI;
if (fc < 0) teta += M_PI;
Xax = Cos(teta);
Yax = Sin(teta);

10
src/IGESGeom/IGESGeom_ToolConicArc.cxx
View File

@@ -230,10 +230,10 @@ void IGESGeom_ToolConicArc::OwnCheck(const Handle(IGESGeom_ConicArc)& ent,
gp_Dir2d d2(ent->EndPoint().X() - xc, ent->EndPoint().Y() - yc);
Standard_Real t1 = d0.Angle(d1);
Standard_Real t2 = d0.Angle(d2);
t1 += (t1 > 0 ? 0 : 2*PI);
t2 += (t2 > 0 ? 0 : 2*PI);
t2 += (t1 <= t2 ? 0 : 2*PI);
if ( !(0 <= t1 && t1 <= 2*PI) || !(0 <= t2-t1 && t2-t1 <= 2*PI) )
t1 += (t1 > 0 ? 0 : 2*M_PI);
t2 += (t2 > 0 ? 0 : 2*M_PI);
t2 += (t1 <= t2 ? 0 : 2*M_PI);
if ( !(0 <= t1 && t1 <= 2*M_PI) || !(0 <= t2-t1 && t2-t1 <= 2*M_PI) )
ach.AddFail("Parameter Error for Hyperbola");
}
else if (ent->FormNumber() == 3)
@@ -245,7 +245,7 @@ void IGESGeom_ToolConicArc::OwnCheck(const Handle(IGESGeom_ConicArc)& ent,
gp_Dir2d d2(ent->EndPoint().X() - xc, ent->EndPoint().Y() - yc);
Standard_Real t1 = d0.Angle(d1);
Standard_Real t2 = d0.Angle(d2);
if ( !(-PI/2 < t1 && t1 < PI/2) || !(-PI/2 < t2 && t2 < PI/2) )
if ( !(-M_PI/2 < t1 && t1 < M_PI/2) || !(-M_PI/2 < t2 && t2 < M_PI/2) )
ach.AddFail("Parameter Error for Parabola");
}
*/

2
src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cxx
View File

@@ -139,7 +139,7 @@ void IGESGeom_ToolSurfaceOfRevolution::OwnCheck
const Interface_ShareTool& , Handle(Interface_Check)& /*ach*/) const
{
// Standard_Real diffang = ent->EndAngle() - ent->StartAngle();
// if (diffang <= 0.0 || diffang > 2.0 * PI)
// if (diffang <= 0.0 || diffang > 2.0 * M_PI)
// ach.AddFail("0 < TA - SA <= 2Pi is not satisfied");
}