1
0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

@@ -994,7 +994,7 @@ static Standard_Boolean BSplineEdges(const TopoDS_Edge& E1,
if (Der1.Magnitude() <= gp::Resolution() ||
Der2.Magnitude() <= gp::Resolution())
angle = PI/2.;
angle = M_PI/2.;
else
angle = Der1.Angle(Der2);
@@ -1031,7 +1031,7 @@ static Standard_Real AngleWireEdge(const TopoDS_Wire& aWire,
if (V11.IsSame(CV) && V21.IsSame(CV))
{
BSplineEdges( FirstEdge, anEdge, 0, 0, Angle );
Angle = PI - Angle;
Angle = M_PI - Angle;
}
else if (V11.IsSame(CV) && V22.IsSame(CV))
BSplineEdges( FirstEdge, anEdge, 0, 1, Angle );
@@ -1040,7 +1040,7 @@ static Standard_Real AngleWireEdge(const TopoDS_Wire& aWire,
else
{
BSplineEdges( FirstEdge, anEdge, 1, 1, Angle );
Angle = PI - Angle;
Angle = M_PI - Angle;
}
return Angle;
}