OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +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/Adaptor3d/Adaptor3d_CurveOnSurface.cxx
View File

@@ -1323,7 +1323,7 @@ void Adaptor3d_CurveOnSurface::EvalKPart()
if ( D.IsParallel(gp::DX2d(),Precision::Angular())) { // Iso V.
if ( STy == GeomAbs_Sphere) {
gp_Pnt2d P = myCurve->Line().Location();
if ( Abs( Abs(P.Y()) -PI/2. ) >= Precision::PConfusion()) {
if ( Abs( Abs(P.Y()) -M_PI/2. ) >= Precision::PConfusion()) {
myType = GeomAbs_Circle;
gp_Sphere Sph = mySurface->Sphere();
gp_Ax3 Axis = Sph.Position();

10
src/Adaptor3d/Adaptor3d_SurfaceOfRevolution.cxx
View File

@@ -160,7 +160,7 @@ Standard_Real Adaptor3d_SurfaceOfRevolution::FirstUParameter() const
Standard_Real Adaptor3d_SurfaceOfRevolution::LastUParameter() const
{
return 2*PI;
return 2*M_PI;
}
//=======================================================================
@@ -236,7 +236,7 @@ void Adaptor3d_SurfaceOfRevolution::UIntervals (TColStd_Array1OfReal& T,
const GeomAbs_Shape ) const
{
T(T.Lower() ) = 0.;
T(T.Lower()+1) = 2*PI;
T(T.Lower()+1) = 2*M_PI;
}
@@ -276,7 +276,7 @@ Handle(Adaptor3d_HSurface) Adaptor3d_SurfaceOfRevolution::UTrim
Standard_Real Eps = Precision::PConfusion();
#endif
Standard_OutOfRange_Raise_if
( Abs(First) > Eps || Abs(Last - 2.*PI) > Eps,
( Abs(First) > Eps || Abs(Last - 2.*M_PI) > Eps,
"Adaptor3d_SurfaceOfRevolution : UTrim : Parameters out of range");
Handle(Adaptor3d_HSurfaceOfRevolution) HR =
@@ -341,7 +341,7 @@ Standard_Boolean Adaptor3d_SurfaceOfRevolution::IsUPeriodic() const
Standard_Real Adaptor3d_SurfaceOfRevolution::UPeriod() const
{
return 2*PI;
return 2*M_PI;
}
//=======================================================================
@@ -493,7 +493,7 @@ gp_Vec Adaptor3d_SurfaceOfRevolution::DN(const Standard_Real U,
}
else {
Standard_Real DNR = DNv * myAxeRev.XDirection();
gp_Vec DNu = ( myAxeRev.XDirection()).Rotated( myAxis, U + NU*PI/2);
gp_Vec DNu = ( myAxeRev.XDirection()).Rotated( myAxis, U + NU*M_PI/2);
return ( DNR * DNu);
}
}

2
src/Adaptor3d/Adaptor3d_TopolTool.cxx
View File

@@ -30,7 +30,7 @@ static void GetConeApexParam(const gp_Cone& C, Standard_Real& U, Standard_Real&
else {
U = atan2(Ploc.Y(),Ploc.X());
}
if (U < -1.e-16) U += (PI+PI);
if (U < -1.e-16) U += (M_PI+M_PI);
else if (U < 0) U = 0;
V = sin(SAngle) * ( Ploc.X() * cos(U) + Ploc.Y() * sin(U) - Radius)