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

2
src/IntAna/IntAna_Curve.cxx
View File

@@ -389,7 +389,7 @@
Standard_Real& Para) const
{
Standard_Real theta,z, aTolPrecision=0.0001;
Standard_Real PIpPI = Standard_PI+Standard_PI;
Standard_Real PIpPI = M_PI + M_PI;
//
switch (typequadric) {

2
src/IntAna/IntAna_IntConicQuad.cxx
View File

@@ -31,7 +31,7 @@
#include <ElCLib.hxx>
static Standard_Real PIpPI = Standard_PI+Standard_PI;
static Standard_Real PIpPI = M_PI + M_PI;
//=============================================================================
//== E m p t y C o n s t r u c t o r
//==

14
src/IntAna/IntAna_IntQuadQuad.cxx
View File

@@ -55,7 +55,7 @@ class TrigonometricRoots {
Standard_Boolean IsARoot(Standard_Real u) {
Standard_Integer i;
Standard_Real aEps=RealEpsilon();
Standard_Real PIpPI = Standard_PI+Standard_PI;
Standard_Real PIpPI = M_PI + M_PI;
//
for(i=0 ; i<NbRoots; ++i) {
if(Abs(u - Roots[i])<=aEps) {
@@ -103,7 +103,7 @@ TrigonometricRoots::TrigonometricRoots(const Standard_Real CC,
{
Standard_Integer i, j, SvNbRoots;
Standard_Boolean Triee;
Standard_Real PIpPI = Standard_PI+Standard_PI;
Standard_Real PIpPI = M_PI + M_PI;
//
done=Standard_False;
//
@@ -269,7 +269,7 @@ void IntAna_IntQuadQuad::Perform(const gp_Cylinder& Cyl,
Z_NEGATIF=Standard_False;
//
Standard_Real Qxx,Qyy,Qzz,Qxy,Qxz,Qyz,Qx,Qy,Qz,Q1, aRealEpsilon, RCyl, R2;
Standard_Real PIpPI = Standard_PI+Standard_PI;
Standard_Real PIpPI = M_PI + M_PI;
//
for(Standard_Integer raz = 0 ; raz < myNbMaxCurves ; raz++) {
previouscurve[raz] = nextcurve[raz] = 0;
@@ -370,7 +370,7 @@ void IntAna_IntQuadQuad::Perform(const gp_Cylinder& Cyl,
//-- Si Positif ---> 2 Courbes
//-- Sinon ---> Pas de solution
//--------------------------------------------------------------
if(MTF.Value(PI) >= -aRealEpsilon) {
if(MTF.Value(M_PI) >= -aRealEpsilon) {
TheCurve[0].SetCylinderQuadValues(Cyl,Qxx,Qyy,Qzz,Qxy,Qxz,Qyz,Qx,Qy,Qz,Q1,
myEpsilon,0.0,PIpPI,
@@ -404,7 +404,7 @@ void IntAna_IntQuadQuad::Perform(const gp_Cylinder& Cyl,
//-- entre les 2 racines ( Ici Tout le domaine )
//-- Sinon Seulement un point Tangent
//------------------------------------------------------------
if(MTF.Value(PolDIS.Value(1)+PI) >= -aRealEpsilon ) {
if(MTF.Value(PolDIS.Value(1)+M_PI) >= -aRealEpsilon ) {
//------------------------------------------------------------
//-- On a Un Point de Tangence + Une Courbe Solution
//------------------------------------------------------------
@@ -582,7 +582,7 @@ void IntAna_IntQuadQuad::Perform(const gp_Cone& Cone,
Standard_Integer i;
Standard_Real Qxx,Qyy,Qzz,Qxy,Qxz,Qyz,Qx,Qy,Qz,Q1;
Standard_Real Theta1, Theta2, TgAngle;
Standard_Real PIpPI = Standard_PI+Standard_PI;
Standard_Real PIpPI = M_PI + M_PI;
//
done=Standard_True;
identical = Standard_False;
@@ -745,7 +745,7 @@ void IntAna_IntQuadQuad::Perform(const gp_Cone& Cone,
// 2
// f(z,t)=A(t)*z + B(t)*z + C(t) Discriminant(t) != 0
//
if(!nbsol && (MTF.Value(PI)<0.) ) {
if(!nbsol && (MTF.Value(M_PI)<0.) ) {
//-- Discriminant signe constant negatif
return;
}

14
src/IntAna/IntAna_QuadQuadGeo.cxx
View File

@@ -387,9 +387,9 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
gp_Vec ldv( axec.Direction() );
gp_Vec npv( normp );
Standard_Real dA = Abs( ldv.Angle( npv ) );
if( dA > (PI/4.) )
if( dA > (M_PI/4.) )
{
Standard_Real dang = Abs( ldv.Angle( npv ) ) - PI/2.;
Standard_Real dang = Abs( ldv.Angle( npv ) ) - M_PI/2.;
Standard_Real dangle = Abs( dang );
if( dangle > Tolang )
{
@@ -947,7 +947,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
Standard_Real A=DirCyl1.Angle(DirCyl2);
Standard_Real B;
B=Abs(Sin(0.5*(PI-A)));
B=Abs(Sin(0.5*(M_PI-A)));
A=Abs(Sin(0.5*A));
if(A==0.0 || B==0.0) {
@@ -1308,7 +1308,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
// Preliminary analysis. Determination of iRet
//
iRet=0;
aHalfPI=0.5*PI;
aHalfPI=0.5*M_PI;
aD1=1.;
aPA1.SetCoord(aD1, 0.);
aP0.SetCoord(0., 0.);
@@ -1317,7 +1317,7 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
aAx2=Con2.Axis();
aGamma=aAx1.Angle(aAx2);
if (aGamma>aHalfPI){
aGamma=PI-aGamma;
aGamma=M_PI-aGamma;
}
aCosGamma=Cos(aGamma);
aSinGamma=Sin(aGamma);
@@ -1485,8 +1485,8 @@ gp_Ax2 DirToAx2(const gp_Pnt& P,const gp_Dir& D)
//Other generatrixes of cones laying in maximal plane
gp_Lin aGen1 = aGen.Rotated(Con1.Axis(), Standard_PI);
gp_Lin aGen2 = aGen.Rotated(Con2.Axis(), Standard_PI);
gp_Lin aGen1 = aGen.Rotated(Con1.Axis(), M_PI);
gp_Lin aGen2 = aGen.Rotated(Con2.Axis(), M_PI);
//
//Intersection point of generatrixes
gp_Dir aN; //solution plane normal