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

4
src/BRepBlend/BRepBlend_RstRstConstRad.cxx
View File

@@ -290,7 +290,7 @@ Standard_Boolean BRepBlend_RstRstConstRad::IsSolution(const math_Vector& Sol,
Angle = ACos(Cosa);
if (Sina < 0.) {
Angle = 2.*PI - Angle;
Angle = 2.*M_PI - Angle;
}
if (Angle > maxang) {maxang = Angle;}
@@ -609,7 +609,7 @@ void BRepBlend_RstRstConstRad::Section(const Standard_Real Param,
Pfin = ElCLib::Parameter(C, ptrst2);
// Test of angles negative and almost null : Special Case
if (Pfin > 1.5 * PI) {
if (Pfin > 1.5 * M_PI) {
np.Reverse();
C.SetPosition(gp_Ax2(Center, np, ns));
Pfin = ElCLib::Parameter(C, ptrst2);

4
src/BRepBlend/BRepBlend_RstRstEvolRad.cxx
View File

@@ -361,7 +361,7 @@ Standard_Boolean BRepBlend_RstRstEvolRad::IsSolution(const math_Vector& Sol,
Angle = ACos(Cosa);
if (Sina < 0.) {
Angle = 2.*PI - Angle;
Angle = 2.*M_PI - Angle;
}
if (Angle > maxang) {maxang = Angle;}
@@ -678,7 +678,7 @@ void BRepBlend_RstRstEvolRad::Section(const Standard_Real Param,
Pfin = ElCLib::Parameter(C, ptrst2);
// Test negative and quasi null angles: Special case
if (Pfin > 1.5 * PI) {
if (Pfin > 1.5 * M_PI) {
np.Reverse();
C.SetPosition(gp_Ax2(Center, np, ns));
Pfin = ElCLib::Parameter(C, ptrst2);

4
src/BRepBlend/BRepBlend_SurfRstConstRad.cxx
View File

@@ -406,7 +406,7 @@ Standard_Boolean BRepBlend_SurfRstConstRad::IsSolution(const math_Vector& Sol,
Angle = ACos(Cosa);
if (Sina <0.) {
Angle = 2.*PI - Angle;
Angle = 2.*M_PI - Angle;
}
if (Angle>maxang) {maxang = Angle;}
@@ -663,7 +663,7 @@ void BRepBlend_SurfRstConstRad::Section(const Standard_Real Param,
Pfin = ElCLib::Parameter(C,ptrst);
// Test negative and almost null angles : Special case
if (Pfin>1.5*PI) {
if (Pfin>1.5*M_PI) {
np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns));
Pfin = ElCLib::Parameter(C,ptrst);

4
src/BRepBlend/BRepBlend_SurfRstEvolRad.cxx
View File

@@ -463,7 +463,7 @@ const Standard_Real Tol)
Angle = ACos(Cosa);
if (Sina <0.) {
Angle = 2.*PI - Angle;
Angle = 2.*M_PI - Angle;
}
if (Angle>maxang) {maxang = Angle;}
@@ -708,7 +708,7 @@ gp_Circ& C)
Pfin = ElCLib::Parameter(C,ptrst);
// Test negative and almost null angles : Single Case
if (Pfin>1.5*PI) {
if (Pfin>1.5*M_PI) {
np.Reverse();
C.SetPosition(gp_Ax2(Center,np,ns));
Pfin = ElCLib::Parameter(C,ptrst);