OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +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/math/math_DirectPolynomialRoots.cxx
View File

@@ -375,7 +375,7 @@ void math_DirectPolynomialRoots::Solve(const Standard_Real a,
else {
Omega = atan(0.5 * Q / sqrt(- Discr));
Sp3 = sqrt(-P / 3.0);
Y1 = -2.0 * Sb * Sp3 * cos(PI / 6.0 - Sb * Omega / 3.0);
Y1 = -2.0 * Sb * Sp3 * cos(M_PI / 6.0 - Sb * Omega / 3.0);
TheRoots[0] = - Beta / 3.0 + Y1;
if(Beta * Q <= 0.0) {
TheRoots[1] = - Beta / 3.0 + 2.0 * Sp3 * sin(Omega / 3.0);

8
src/math/math_TrigonometricFunctionRoots.cxx
View File

@@ -129,7 +129,7 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
Eps = 1.e-12;
Depi = PI+PI;
Depi = M_PI+M_PI;
if (InfBound <= RealFirst() && SupBound >= RealLast()) {
MyBorneInf = 0.0;
Delta = Depi;
@@ -174,7 +174,7 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
}
Zer(1) = ASin(AA);
Zer(2) = PI - Zer(1);
Zer(2) = M_PI - Zer(1);
NZer = 2;
for (i = 1; i <= NZer; i++) {
if (Zer(i) <= -Eps) {
@@ -211,7 +211,7 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
}
// On rend les solutions entre InfBound et SupBound:
// =================================================
Zer(i) += IntegerPart(Mod)*2.*PI;
Zer(i) += IntegerPart(Mod)*2.*M_PI;
X = Zer(i)-MyBorneInf;
if ((X >= (-Epsilon(Delta))) && (X <= Delta+ Epsilon(Delta))) {
NbSol++;
@@ -380,7 +380,7 @@ void math_TrigonometricFunctionRoots::Perform(const Standard_Real A,
if(NbSol<4) {
Standard_Integer startIndex = NbSol + 1;
for( Standard_Integer solIt = startIndex; solIt <= 4; solIt++) {
Teta = PI + IntegerPart(Mod)*2.0*PI;;
Teta = M_PI + IntegerPart(Mod)*2.0*M_PI;;
X = Teta - MyBorneInf;
if ((X >= (-Epsilon(Delta))) && (X <= Delta + Epsilon(Delta))) {
if (Abs(A-C+E) <= Eps) {