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

2
src/GC/GC_MakeConicalSurface.cxx
View File

@@ -14,7 +14,7 @@ GC_MakeConicalSurface::GC_MakeConicalSurface(const gp_Ax2& A2 ,
const Standard_Real Radius)
{
if (Radius < 0.) { TheError = gce_NegativeRadius; }
else if (Ang <= gp::Resolution() || Ang >= PI/2. - gp::Resolution()) {
else if (Ang <= gp::Resolution() || Ang >= M_PI/2. - gp::Resolution()) {
TheError = gce_BadAngle;
}
else {

4
src/GC/GC_MakeTrimmedCone.cxx
View File

@@ -34,7 +34,7 @@ GC_MakeTrimmedCone::GC_MakeTrimmedCone(const gp_Pnt& P1 ,
gp_Pnt P5 = ext1.Point(1).Value();
gp_Pnt P6 = ext2.Point(1).Value();
Standard_Real D = P6.Distance(P5)/cos((Cone.Value())->SemiAngle());
TheCone=new Geom_RectangularTrimmedSurface(Cone.Value(),0.,2.*PI,0.,D,Standard_True,Standard_True);
TheCone=new Geom_RectangularTrimmedSurface(Cone.Value(),0.,2.*M_PI,0.,D,Standard_True,Standard_True);
}
}
@@ -50,7 +50,7 @@ GC_MakeTrimmedCone::GC_MakeTrimmedCone(const gp_Pnt& P1 ,
TheError = Cone.Status();
if (TheError == gce_Done) {
Standard_Real D = (P2.Distance(P1))/cos((Cone.Value())->SemiAngle());
TheCone=new Geom_RectangularTrimmedSurface(Cone.Value(),0.,2.*PI,0.,D,Standard_True,Standard_True);
TheCone=new Geom_RectangularTrimmedSurface(Cone.Value(),0.,2.*M_PI,0.,D,Standard_True,Standard_True);
}
}

6
src/GC/GC_MakeTrimmedCylinder.cxx
View File

@@ -21,7 +21,7 @@ GC_MakeTrimmedCylinder::GC_MakeTrimmedCylinder(const gp_Pnt& P1 ,
GC_MakeCylindricalSurface Cyl(P1,P2,P3);
TheError = Cyl.Status();
if (TheError == gce_Done) {
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*PI,0.,
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*M_PI,0.,
P2.Distance(P1),Standard_True,Standard_True);
}
}
@@ -35,7 +35,7 @@ GC_MakeTrimmedCylinder::GC_MakeTrimmedCylinder(const gp_Circ& Circ ,
GC_MakeCylindricalSurface Cyl(Circ);
TheError = Cyl.Status();
if (TheError == gce_Done) {
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*PI,0.,
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*M_PI,0.,
Height,Standard_True,Standard_True);
}
}
@@ -49,7 +49,7 @@ GC_MakeTrimmedCylinder::GC_MakeTrimmedCylinder(const gp_Ax1& A1 ,
GC_MakeCylindricalSurface Cyl(A1,Radius);
TheError = Cyl.Status();
if (TheError == gce_Done) {
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*PI,0.,
TheCyl = new Geom_RectangularTrimmedSurface(Cyl.Value(),0.,2.*M_PI,0.,
Height,Standard_True,Standard_True);
}
}