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

16
src/LocalAnalysis/LocalAnalysis_CurveContinuity.cxx
View File

@@ -30,7 +30,7 @@ void LocalAnalysis_CurveContinuity::CurvC1( GeomLProp_CLProps& Curv1,
{ myLambda1 = norm2 / norm1;}
else { myLambda1 = norm1 / norm2;}
ang= V1.Angle(V2);
if (ang>PI/2) myContC1=PI-ang;
if (ang>M_PI/2) myContC1=M_PI-ang;
else myContC1=ang;
}
else {myIsDone= Standard_False;
@@ -62,7 +62,7 @@ void LocalAnalysis_CurveContinuity::CurvC2(GeomLProp_CLProps& Curv1,
else {myLambda1 = norm1 / norm2;
myLambda2 = norm12 / norm22;}
ang=V12.Angle(V22);
if (ang>PI/2) myContC2=PI-ang;
if (ang>M_PI/2) myContC2=M_PI-ang;
else myContC2=ang; }
else{myIsDone= Standard_False ;
@@ -82,7 +82,7 @@ void LocalAnalysis_CurveContinuity::CurvG1 ( GeomLProp_CLProps& Curv1,
{ Curv1.Tangent(Tang1);
Curv2.Tangent(Tang2);
ang=Tang1.Angle(Tang2);
if (ang>PI/2) myContG1=PI-ang;
if (ang>M_PI/2) myContG1=M_PI-ang;
else myContG1=ang;
}
else {myIsDone= Standard_False ;
@@ -107,7 +107,7 @@ void LocalAnalysis_CurveContinuity::CurvG2( GeomLProp_CLProps& Curv1,
Curv1.Normal(D1);
Curv2.Normal(D2);
ang =D1.Angle(D2);
if (ang>PI/2) myContG2=PI-ang;
if (ang>M_PI/2) myContG2=M_PI-ang;
else myContG2=ang;
myCourbC1= Curv1.Curvature();
myCourbC2 = Curv2.Curvature();
@@ -197,7 +197,7 @@ Standard_Boolean LocalAnalysis_CurveContinuity::IsC0() const
Standard_Boolean LocalAnalysis_CurveContinuity::IsC1() const
{
if (!myIsDone) { StdFail_NotDone::Raise();}
if ( IsC0() && ( (myContC1 <= myepsC1)||(Abs(myContC1-PI)<=myepsC1)))
if ( IsC0() && ( (myContC1 <= myepsC1)||(Abs(myContC1-M_PI)<=myepsC1)))
return Standard_True;
else return Standard_False;
}
@@ -209,7 +209,7 @@ Standard_Boolean LocalAnalysis_CurveContinuity::IsC2() const
if (!myIsDone) { StdFail_NotDone::Raise();}
if ( IsC1())
{ if ((myContC2 <= myepsC2)||(Abs(myContC2-PI)<=myepsC2))
{ if ((myContC2 <= myepsC2)||(Abs(myContC2-M_PI)<=myepsC2))
{ epsil1 = 0.5*myepsC1*myepsC1*myLambda1;
epsil2 = 0.5*myepsC2*myepsC2*myLambda2;
if ( (Abs(myLambda1*myLambda1-myLambda2)) <= (epsil1*epsil1+epsil2))
@@ -226,7 +226,7 @@ Standard_Boolean LocalAnalysis_CurveContinuity::IsC2() const
Standard_Boolean LocalAnalysis_CurveContinuity::IsG1() const
{
if (!myIsDone) { StdFail_NotDone::Raise();}
if ( IsC0() && (( myContG1 <= myepsG1||(Abs(myContG1-PI)<=myepsG1))))
if ( IsC0() && (( myContG1 <= myepsG1||(Abs(myContG1-M_PI)<=myepsG1))))
return Standard_True;
else return Standard_False;
}
@@ -253,7 +253,7 @@ Standard_Boolean LocalAnalysis_CurveContinuity::IsG2()const
else IETA2=1;
if (IETA1 == IETA2)
{ if (IETA1 == 1)
{ Standard_Real eps= RealPart( (myContG2+myepsG2)/PI) * PI;
{ Standard_Real eps= RealPart( (myContG2+myepsG2)/M_PI) * M_PI;
if (Abs( eps - myepsG2) < myepsG2)
{if (myG2Variation < myperce )
return Standard_True;

10
src/LocalAnalysis/LocalAnalysis_SurfaceContinuity.cxx
View File

@@ -51,10 +51,10 @@ void LocalAnalysis_SurfaceContinuity::SurfC1( GeomLProp_SLProps& Surf1,
myLambda1V= norm2v / norm1v;
else myLambda1V = norm2v / norm1v;
angu= V1u.Angle(V2u);
if (angu>PI/2) myContC1U=PI-angu;
if (angu>M_PI/2) myContC1U=M_PI-angu;
else myContC1U=angu;
angv= V1v.Angle(V2v);
if (angv>PI/2) myContC1V=PI-angv;
if (angv>M_PI/2) myContC1V=M_PI-angv;
else myContC1V=angv; }
else {myIsDone = Standard_False;
myErrorStatus=LocalAnalysis_NullFirstDerivative;}
@@ -85,7 +85,7 @@ void LocalAnalysis_SurfaceContinuity::SurfC2( GeomLProp_SLProps& Surf1,
else {myLambda1U = norm11u / norm12u;
myLambda2U = norm21u / norm22u;}
ang=V21u.Angle(V22u);
if(ang>PI/2) myContC2U=PI-ang;
if(ang>M_PI/2) myContC2U=M_PI-ang;
else myContC2U=ang; }
else
{ myIsDone=Standard_False;
@@ -112,7 +112,7 @@ void LocalAnalysis_SurfaceContinuity::SurfC2( GeomLProp_SLProps& Surf1,
else{ myLambda1V = norm11v / norm12v;
myLambda2V = norm21v / norm22v;}
ang= V21v.Angle(V22v);
if (ang>PI/2) myContC2V=PI-ang;
if (ang>M_PI/2) myContC2V=M_PI-ang;
else myContC2V=ang;
}
else{ myIsDone= Standard_False;
@@ -129,7 +129,7 @@ void LocalAnalysis_SurfaceContinuity::SurfG1( GeomLProp_SLProps& Surf1,
{ gp_Dir D1 = Surf1.Normal();
gp_Dir D2 = Surf2.Normal();
Standard_Real ang=D1.Angle(D2);
if (ang>PI/2) myContG1= PI-ang;
if (ang>M_PI/2) myContG1= M_PI-ang;
else myContG1=ang;
}
else{ myIsDone=Standard_False;