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

8
src/BRepPrim/BRepPrim_Cone.cxx
View File

@@ -31,7 +31,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
Standard_DomainError::Raise("cone with null height");
if (myHalfAngle*Height < Precision::Confusion())
Standard_DomainError::Raise("cone with null angle");
if ((PI/2 - myHalfAngle)*Height < Precision::Confusion())
if ((M_PI/2 - myHalfAngle)*Height < Precision::Confusion())
Standard_DomainError::Raise("cone with angle > PI/2");
// cut at top
@@ -50,7 +50,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle) :
myHalfAngle(Angle),
myRadius(0.)
{
if ((Angle < 0) || (Angle > PI/2))
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();
@@ -68,7 +68,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
myHalfAngle(Angle),
myRadius(0.)
{
if ((Angle < 0) || (Angle > PI/2))
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();
@@ -84,7 +84,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle,
BRepPrim_Revolution( Axes, 0,RealLast()),
myHalfAngle(Angle)
{
if ((Angle < 0) || (Angle > PI/2))
if ((Angle < 0) || (Angle > M_PI/2))
Standard_DomainError::Raise("cone with angle <0 or > PI/2");
VMin(0.);
SetMeridian();

6
src/BRepPrim/BRepPrim_Sphere.cxx
View File

@@ -16,8 +16,8 @@
// parameters on the meridian
#define PMIN (-0.5*PI)
#define PMAX (0.5*PI)
#define PMIN (-0.5*M_PI)
#define PMAX (0.5*M_PI)
//=======================================================================
//function : BRepPrim_Sphere
@@ -82,7 +82,7 @@ void BRepPrim_Sphere::SetMeridian()
// Offset the parameters on the meridian
// to trim the edge in 3pi/2, 5pi/2
SetMeridianOffset(2*PI);
SetMeridianOffset(2*M_PI);
gp_Dir D = Axes().YDirection();
D.Reverse();

6
src/BRepPrim/BRepPrim_Torus.cxx
View File

@@ -24,7 +24,7 @@
BRepPrim_Torus::BRepPrim_Torus(const gp_Ax2& Position,
const Standard_Real Major,
const Standard_Real Minor) :
BRepPrim_Revolution(Position,0,2*PI),
BRepPrim_Revolution(Position,0,2*M_PI),
myMajor(Major),
myMinor(Minor)
{
@@ -38,7 +38,7 @@ BRepPrim_Torus::BRepPrim_Torus(const gp_Ax2& Position,
BRepPrim_Torus::BRepPrim_Torus(const Standard_Real Major,
const Standard_Real Minor) :
BRepPrim_Revolution(gp::XOY(),0,2*PI),
BRepPrim_Revolution(gp::XOY(),0,2*M_PI),
myMajor(Major),
myMinor(Minor)
{
@@ -54,7 +54,7 @@ BRepPrim_Torus::BRepPrim_Torus(const gp_Pnt& Center,
const Standard_Real Major,
const Standard_Real Minor) :
BRepPrim_Revolution(gp_Ax2(Center,gp_Dir(0,0,1),gp_Dir(1,0,0)),
0,2*PI),
0,2*M_PI),
myMajor(Major),
myMinor(Minor)
{