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

8
src/Extrema/Extrema_ExtElC.cxx
View File

@@ -57,7 +57,7 @@ class ExtremaExtElC_TrigonometricRoots {
Standard_Real PIpPI, aEps;
//
aEps=RealEpsilon();
PIpPI=Standard_PI+Standard_PI;
PIpPI = M_PI + M_PI;
for(Standard_Integer i=0 ; i<NbRoots; i++) {
if(Abs(u - Roots[i])<=aEps) {
return Standard_True ;
@@ -127,7 +127,7 @@ ExtremaExtElC_TrigonometricRoots::
Standard_Integer j, SvNbRoots;
Standard_Real aTwoPI, aMaxCoef, aPrecision;
//
aTwoPI=PI+PI;
aTwoPI=M_PI+M_PI;
NbRoots=MTFR.NbSolutions();
for(i=0;i<NbRoots;++i) {
Roots[i]=MTFR.Value(i+1);
@@ -410,7 +410,7 @@ Method:
A4 = 0.;
}
//
ExtremaExtElC_TrigonometricRoots Sol(A1,A2,A3,A4,A5,0.,PI+PI);
ExtremaExtElC_TrigonometricRoots Sol(A1,A2,A3,A4,A5,0.,M_PI+M_PI);
if (!Sol.IsDone()) {
return;
}
@@ -520,7 +520,7 @@ Method:
if(fabs(A4) <= aEps) A4 = 0.;
//modified by NIZNHY-PKV Thu Feb 03 14:51:08 2011t
//
ExtremaExtElC_TrigonometricRoots Sol(A1,A2,A3,A4,A5,0.,PI+PI);
ExtremaExtElC_TrigonometricRoots Sol(A1,A2,A3,A4,A5,0.,M_PI+M_PI);
if (!Sol.IsDone()) { return; }
// Storage of solutions ...