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

4
src/Geom/Geom_Circle.cxx
View File

@@ -82,7 +82,7 @@ Standard_Boolean Geom_Circle::IsPeriodic () const { return Standard_True; }
Standard_Real Geom_Circle::ReversedParameter( const Standard_Real U) const
{
return ( 2. * PI - U);
return ( 2. * M_PI - U);
}
//=======================================================================
@@ -106,7 +106,7 @@ Standard_Real Geom_Circle::FirstParameter () const { return 0.0; }
//purpose :
//=======================================================================
Standard_Real Geom_Circle::LastParameter () const { return 2.0 * PI; }
Standard_Real Geom_Circle::LastParameter () const { return 2.0 * M_PI; }
//=======================================================================

8
src/Geom/Geom_ConicalSurface.cxx
View File

@@ -63,7 +63,7 @@ Geom_ConicalSurface::Geom_ConicalSurface ( const Ax3& A3 ,
radius(R), semiAngle (Ang)
{
if (R < 0.0 || Abs(Ang) <= gp::Resolution() || Abs(Ang) >= PI/2.0 - gp::Resolution())
if (R < 0.0 || Abs(Ang) <= gp::Resolution() || Abs(Ang) >= M_PI/2.0 - gp::Resolution())
Standard_ConstructionError::Raise();
pos = A3;
@@ -89,7 +89,7 @@ Geom_ConicalSurface::Geom_ConicalSurface ( const gp_Cone& C )
Standard_Real Geom_ConicalSurface::UReversedParameter( const Standard_Real U) const
{
return ( 2.*PI - U);
return ( 2.*M_PI - U);
}
@@ -205,7 +205,7 @@ void Geom_ConicalSurface::SetRadius (const Standard_Real R) {
void Geom_ConicalSurface::SetSemiAngle (const Standard_Real Ang) {
if (Abs(Ang) <= gp::Resolution() || Abs(Ang) >= PI/2.0 - gp::Resolution()) {
if (Abs(Ang) <= gp::Resolution() || Abs(Ang) >= M_PI/2.0 - gp::Resolution()) {
Standard_ConstructionError::Raise();
}
semiAngle = Ang;
@@ -235,7 +235,7 @@ Pnt Geom_ConicalSurface::Apex () const
void Geom_ConicalSurface::Bounds (Standard_Real& U1, Standard_Real& U2,
Standard_Real& V1, Standard_Real& V2) const {
U1 = 0.0; U2 = 2.0 * PI;
U1 = 0.0; U2 = 2.0 * M_PI;
V1 = -Precision::Infinite(); V2 = Precision::Infinite();
}

4
src/Geom/Geom_CylindricalSurface.cxx
View File

@@ -84,7 +84,7 @@ Geom_CylindricalSurface::Geom_CylindricalSurface ( const Ax3& A3,
Standard_Real Geom_CylindricalSurface::UReversedParameter( const Standard_Real U) const
{
return (2.*PI - U);
return (2.*M_PI - U);
}
//=======================================================================
@@ -164,7 +164,7 @@ void Geom_CylindricalSurface::SetRadius (const Standard_Real R) {
void Geom_CylindricalSurface::Bounds (Standard_Real& U1, Standard_Real& U2,
Standard_Real& V1, Standard_Real& V2) const {
U1 = 0.0; U2 = 2.0 * PI;
U1 = 0.0; U2 = 2.0 * M_PI;
V1 = - Precision::Infinite(); V2 = Precision::Infinite();
}

4
src/Geom/Geom_Ellipse.cxx
View File

@@ -95,7 +95,7 @@ Standard_Real Geom_Ellipse::FirstParameter () const { return 0.0; }
//purpose :
//=======================================================================
Standard_Real Geom_Ellipse::LastParameter () const { return 2.0 * PI; }
Standard_Real Geom_Ellipse::LastParameter () const { return 2.0 * M_PI; }
//=======================================================================
//function : MajorRadius
@@ -168,7 +168,7 @@ gp_Elips Geom_Ellipse::Elips () const {
Standard_Real Geom_Ellipse::ReversedParameter( const Standard_Real U) const
{
return ( 2. * PI - U);
return ( 2. * M_PI - U);
}

4
src/Geom/Geom_OffsetSurface.cxx
View File

@@ -1497,7 +1497,7 @@ Handle(Geom_Surface) Geom_OffsetSurface::Surface() const
Result = new Geom_CylindricalSurface( Axis, Radius);
}
else if ( Radius <= -Tol ){
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),PI);
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),M_PI);
Result = new Geom_CylindricalSurface( Axis, Abs(Radius));
Result->UReverse();
}
@@ -1537,7 +1537,7 @@ Handle(Geom_Surface) Geom_OffsetSurface::Surface() const
Result = new Geom_SphericalSurface(Axis, Radius);
}
else if ( Radius <= -Tol ) {
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),PI);
Axis.Rotate(gp_Ax1(Axis.Location(),Axis.Direction()),M_PI);
Axis.ZReverse();
Result = new Geom_SphericalSurface(Axis, -Radius);
Result->UReverse();

14
src/Geom/Geom_SphericalSurface.cxx
View File

@@ -80,7 +80,7 @@ Geom_SphericalSurface::Geom_SphericalSurface (const gp_Sphere& S)
Standard_Real Geom_SphericalSurface::UReversedParameter( const Standard_Real U) const
{
return (2.*PI - U);
return (2.*M_PI - U);
}
//=======================================================================
@@ -100,7 +100,7 @@ Standard_Real Geom_SphericalSurface::VReversedParameter( const Standard_Real V)
//=======================================================================
Standard_Real Geom_SphericalSurface::Area () const
{return 4.0 * PI * radius * radius;}
{return 4.0 * M_PI * radius * radius;}
//=======================================================================
//function : Radius
@@ -175,9 +175,9 @@ void Geom_SphericalSurface::Bounds (Standard_Real& U1, Standard_Real& U2,
Standard_Real& V1, Standard_Real& V2) const {
U1 = 0.0;
U2 = PI * 2.0;
V1 = -PI / 2.0;
V2 = PI / 2.0;
U2 = M_PI * 2.0;
V1 = -M_PI / 2.0;
V2 = M_PI / 2.0;
}
@@ -308,7 +308,7 @@ gp_Sphere Geom_SphericalSurface::Sphere () const {
Handle(Curve) Geom_SphericalSurface::UIso (const Standard_Real U) const
{
Handle(Geom_Circle) GC = new Geom_Circle(ElSLib::SphereUIso(pos,radius,U));
Handle(Geom_TrimmedCurve) iso = new Geom_TrimmedCurve(GC,-PI/2.,PI/2);
Handle(Geom_TrimmedCurve) iso = new Geom_TrimmedCurve(GC,-M_PI/2.,M_PI/2);
return iso;
}
@@ -333,7 +333,7 @@ Handle(Curve) Geom_SphericalSurface::VIso (const Standard_Real V) const
Standard_Real Geom_SphericalSurface::Volume () const {
return (4.0 * PI * radius * radius * radius)/3.0;
return (4.0 * M_PI * radius * radius * radius)/3.0;
}

4
src/Geom/Geom_SurfaceOfRevolution.cxx
View File

@@ -155,7 +155,7 @@ void Geom_SurfaceOfRevolution::UReverse () {
Standard_Real Geom_SurfaceOfRevolution::UReversedParameter (const Standard_Real U) const {
return ( 2.*PI - U);
return ( 2.*M_PI - U);
}
@@ -322,7 +322,7 @@ void Geom_SurfaceOfRevolution::Bounds ( Standard_Real& U1,
Standard_Real& V2 ) const {
U1 = 0.0;
U2 = 2.0 * PI;
U2 = 2.0 * M_PI;
V1 = basisCurve->FirstParameter();
V2 = basisCurve->LastParameter();
}

12
src/Geom/Geom_ToroidalSurface.cxx
View File

@@ -112,7 +112,7 @@ Standard_Real Geom_ToroidalSurface::MinorRadius () const {
Standard_Real Geom_ToroidalSurface::UReversedParameter( const Standard_Real U) const {
return (2.*PI - U);
return (2.*M_PI - U);
}
@@ -123,7 +123,7 @@ Standard_Real Geom_ToroidalSurface::UReversedParameter( const Standard_Real U) c
Standard_Real Geom_ToroidalSurface::VReversedParameter( const Standard_Real V) const {
return (2.*PI - V);
return (2.*M_PI - V);
}
@@ -215,7 +215,7 @@ void Geom_ToroidalSurface::SetTorus (const gp_Torus& T) {
//=======================================================================
Standard_Real Geom_ToroidalSurface::Area () const {
return 4.0 * PI * PI * minorRadius * majorRadius;
return 4.0 * M_PI * M_PI * minorRadius * majorRadius;
}
@@ -231,8 +231,8 @@ void Geom_ToroidalSurface::Bounds (Standard_Real& U1,
U1 = 0.0;
V1 = 0.0;
U2 = 2*PI;
V2 = 2*PI;
U2 = 2*M_PI;
V2 = 2*M_PI;
}
@@ -366,7 +366,7 @@ Handle(Geom_Curve) Geom_ToroidalSurface::VIso (const Standard_Real V) const
Standard_Real Geom_ToroidalSurface::Volume () const {
return (PI * minorRadius * minorRadius) * (2.0 * PI * majorRadius);
return (M_PI * minorRadius * minorRadius) * (2.0 * M_PI * majorRadius);
}