OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-08 14:17:06 +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

10
src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
View File

@@ -1113,10 +1113,10 @@ static Standard_Integer OneShapeIsHalfSpace(const TopoDS_Shape& S1,const TopoDS_
Standard_Real maxU = FSurf.LastUParameter();
Standard_Real minV = FSurf.FirstVParameter();
Standard_Real maxV = FSurf.LastVParameter();
Standard_Boolean yesU = ( Abs(minU - 0.) < 1.e-9 && Abs(maxU - 2*PI) < 1.e-9 );
Standard_Boolean yesU = ( Abs(minU - 0.) < 1.e-9 && Abs(maxU - 2*M_PI) < 1.e-9 );
Standard_Boolean yesV = ( FSurf.GetType() == GeomAbs_Sphere ) ?
( Abs(minV - (-PI/2.)) < 1.e-9 && Abs(maxV - PI/2.) < 1.e-9 ) :
( Abs(minV - 0.) < 1.e-9 && Abs(maxV - 2*PI) < 1.e-9 );
( Abs(minV - (-M_PI/2.)) < 1.e-9 && Abs(maxV - M_PI/2.) < 1.e-9 ) :
( Abs(minV - 0.) < 1.e-9 && Abs(maxV - 2*M_PI) < 1.e-9 );
SolidIsSphereOrTorus = ( yesU && yesV );
}
@@ -1125,8 +1125,8 @@ static Standard_Integer OneShapeIsHalfSpace(const TopoDS_Shape& S1,const TopoDS_
Standard_Boolean areBothPeriodic = ( FSurf.IsUPeriodic() && FSurf.IsVPeriodic() );
if( areBothPeriodic )
{
Standard_Boolean yesU = ( Abs(FSurf.UPeriod() - PI) < 1.e-9 || Abs(FSurf.UPeriod() - 2*PI) < 1.e-9 );
Standard_Boolean yesV = ( Abs(FSurf.VPeriod() - PI) < 1.e-9 || Abs(FSurf.VPeriod() - 2*PI) < 1.e-9 );
Standard_Boolean yesU = ( Abs(FSurf.UPeriod() - M_PI) < 1.e-9 || Abs(FSurf.UPeriod() - 2*M_PI) < 1.e-9 );
Standard_Boolean yesV = ( Abs(FSurf.VPeriod() - M_PI) < 1.e-9 || Abs(FSurf.VPeriod() - 2*M_PI) < 1.e-9 );
SolidIsSphereOrTorus = ( yesU && yesV );
}
}

18
src/TopOpeBRep/TopOpeBRep_vprdeg.cxx
View File

@@ -168,19 +168,19 @@ static Standard_Real FUN_getpar(const gp_Dir& a, const gp_Dir& x, const gp_Dir&
Standard_Boolean x1null = (Abs(x1) <= tol);
Standard_Boolean x2null = (Abs(x2) <= tol);
if (x1null) par = (x2 > 0.) ? 3.*PI*.5 : PI*.5;
else if (x2null) par = (x1 > 0.) ? 2.*PI : PI;
if (x1null) par = (x2 > 0.) ? 3.*M_PI*.5 : M_PI*.5;
else if (x2null) par = (x1 > 0.) ? 2.*M_PI : M_PI;
else {
Standard_Real ac = ACos(Abs(x1));
Standard_Boolean x1pos = (x1 > tol);
Standard_Boolean x2pos = (x2 > tol);
if (x1pos && x2pos) par = 2.*PI-ac;
if (x1pos && x2pos) par = 2.*M_PI-ac;
if (x1pos && !x2pos) par = ac;
if (!x1pos && x2pos) par = PI+ac;
if (!x1pos && !x2pos) par = PI-ac;
if (!x1pos && x2pos) par = M_PI+ac;
if (!x1pos && !x2pos) par = M_PI-ac;
}
if (complement) par = 2.*PI - par;
if (complement) par = 2.*M_PI - par;
return par;
}
@@ -418,9 +418,9 @@ static Standard_Boolean FUN_0or2PI(Standard_Real& paronEd, const Standard_Boolea
{
Standard_Real tol = Precision::Parametric(Precision::Confusion());
Standard_Boolean extre = (Abs(paronEd) < tol);
extre = extre && (Abs(2.*PI-paronEd) < tol);
extre = extre && (Abs(2.*M_PI-paronEd) < tol);
if (!extre) return Standard_False;
paronEd = (inout) ? 2.*PI : 0.;
paronEd = (inout) ? 2.*M_PI : 0.;
return Standard_True;
}
@@ -501,7 +501,7 @@ static Standard_Integer FUN_parondgEINFi(const TopOpeBRep_VPointInter& VP,
Standard_Real par = FUN_getpar(a,x,y,complement);
par1OnEd = par;
par2OnEd = (par > PI) ? par-PI : par+PI;
par2OnEd = (par > M_PI) ? par-M_PI : par+M_PI;
// kpart Ec on Fi :
Standard_Boolean changedpar1 = FUN_0or2PI(par1OnEd,T1inout);