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

@@ -584,7 +584,7 @@ Standard_Integer Poly_MakeLoops3D::chooseLeftWay
const Standard_Integer theSegIndex,
const NCollection_List<Standard_Integer>& theLstIndS) const
{
Standard_Real aAngleMin = ::PI * 2;
Standard_Real aAngleMin = M_PI * 2;
gp_Dir aNormal;
const Helper* aHelper = getHelper();
if (!aHelper->GetNormal (theNode, aNormal))
@@ -623,8 +623,8 @@ Standard_Integer Poly_MakeLoops3D::chooseLeftWay
aTgt = aTgtXYZ;
Standard_Real aAngle = aTgt.AngleWithRef(aTgtRef, aNormal);
if (aAngle < 1e-4 - ::PI)
aAngle = ::PI;
if (aAngle < 1e-4 - M_PI)
aAngle = M_PI;
if (aAngle < aAngleMin)
{
aAngleMin = aAngle;
@@ -657,7 +657,7 @@ Standard_Integer Poly_MakeLoops2D::chooseLeftWay
const Standard_Integer theSegIndex,
const NCollection_List<Standard_Integer>& theLstIndS) const
{
Standard_Real aAngleMin = ::PI * 2;
Standard_Real aAngleMin = M_PI * 2;
const Helper* aHelper = getHelper();
Link aLink = getLink(theSegIndex);
gp_Dir2d aTgtRef;
@@ -682,8 +682,8 @@ Standard_Integer Poly_MakeLoops2D::chooseLeftWay
Standard_Real aAngle = aTgt.Angle(aTgtRef);
if (myRightWay)
aAngle = -aAngle;
if (aAngle < 1e-4 - ::PI)
aAngle = ::PI;
if (aAngle < 1e-4 - M_PI)
aAngle = M_PI;
if (aAngle < aAngleMin)
{
aAngleMin = aAngle;