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

4
src/Contap/Contap_ArcFunction.lxx
View File

@@ -8,7 +8,7 @@ inline void Contap_ArcFunction::Set(const gp_Dir& Direction,
{
myType = Contap_DraftStd;
myDir = Direction;
myCosAng = Cos(PI/2.+Angle);
myCosAng = Cos(M_PI/2.+Angle);
}
inline void Contap_ArcFunction::Set(const gp_Pnt& Eye,
@@ -16,7 +16,7 @@ inline void Contap_ArcFunction::Set(const gp_Pnt& Eye,
{
myType = Contap_DraftPrs;
myEye = Eye;
myCosAng = Cos(PI/2.+Angle);
myCosAng = Cos(M_PI/2.+Angle);
}
inline void Contap_ArcFunction::Set(const gp_Dir& Direction)

4
src/Contap/Contap_ContAna.cxx
View File

@@ -114,7 +114,7 @@ void Contap_ContAna::Perform (const gp_Cylinder& C,
Standard_Real Coefcos = D.Dot(C.Position().XDirection());
Standard_Real Coefsin = D.Dot(C.Position().YDirection());
Standard_Real Coefcst = cos(PI*0.5 + Angle);
Standard_Real Coefcst = cos(M_PI*0.5 + Angle);
Standard_Real norm1 = Coefcos*Coefcos + Coefsin*Coefsin;
Standard_Real norm2 = sqrt(norm1);
@@ -266,7 +266,7 @@ void Contap_ContAna::Perform (const gp_Cone& C,
Standard_Real Coefcos = D.Dot(C.Position().XDirection());
Standard_Real Coefsin = D.Dot(C.Position().YDirection());
Standard_Real Coefcst1 = cos(PI*0.5 + Angle);
Standard_Real Coefcst1 = cos(M_PI*0.5 + Angle);
Standard_Real norm1 = Coefcos*Coefcos + Coefsin*Coefsin;
Standard_Real norm2 = Sqrt(norm1);

10
src/Contap/Contap_ContourGen_2.gxx
View File

@@ -97,14 +97,14 @@ static void Recadre(const TheSurface& myHS1,
}
}
if(myHS1IsUPeriodic) {
lmf = PI+PI; //-- myHS1->UPeriod();
lmf = M_PI+M_PI; //-- myHS1->UPeriod();
f = myHS1->FirstUParameter();
l = myHS1->LastUParameter();
while(u1 < f) { u1+=lmf; }
while(u1 > l) { u1-=lmf; }
}
if(myHS1IsVPeriodic) {
lmf = PI+PI; //-- myHS1->VPeriod();
lmf = M_PI+M_PI; //-- myHS1->VPeriod();
f = myHS1->FirstVParameter();
l = myHS1->LastVParameter();
while(v1 < f) { v1+=lmf; }
@@ -205,7 +205,7 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin,
Standard_Boolean novtx = Standard_True;
if(nbvtx) novtx=Standard_False;
for(Standard_Integer i=1;i<nbvtx || novtx;i++) {
Standard_Real firstp=0,lastp=PI+PI;
Standard_Real firstp=0,lastp=M_PI+M_PI;
if(novtx == Standard_False) {
firstp = L.Vertex(i).ParameterOnLine();
lastp = L.Vertex(i+1).ParameterOnLine();
@@ -248,7 +248,7 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin,
}
if(nbvtx) {
Standard_Real firstp = L.Vertex(nbvtx).ParameterOnLine();
Standard_Real lastp = L.Vertex(1).ParameterOnLine() + PI+PI;
Standard_Real lastp = L.Vertex(1).ParameterOnLine() + M_PI+M_PI;
if(Abs(firstp-lastp)>0.0000000001) {
Standard_Real pmid = (firstp+lastp)*0.5;
gp_Pnt Pmid = ElCLib::Value(pmid,L.Circle());
@@ -276,7 +276,7 @@ static void LineConstructor(Contap_TheSequenceOfLine& slin,
Contap_ThePoint pvtx = L.Vertex(nbvtx);
Line.Add(pvtx);
pvtx = L.Vertex(1); pvtx.SetParameter(pvtx.ParameterOnLine()+PI+PI);
pvtx = L.Vertex(1); pvtx.SetParameter(pvtx.ParameterOnLine()+M_PI+M_PI);
Line.Add(pvtx);
Line.SetTransitionOnS(L.TransitionOnS());
slin.Append(Line);

4
src/Contap/Contap_SurfFunction.lxx
View File

@@ -25,7 +25,7 @@ inline void Contap_SurfFunction::Set(const gp_Dir& Direction,
myType = Contap_DraftStd; // Contour vu
myDir = Direction;
myAng = Angle;
myCosAng = Cos(PI/2.+Angle);
myCosAng = Cos(M_PI/2.+Angle);
}
inline void Contap_SurfFunction::Set(const gp_Pnt& Eye,
@@ -34,7 +34,7 @@ inline void Contap_SurfFunction::Set(const gp_Pnt& Eye,
myType = Contap_DraftPrs; // Contour vu "conique"...
myEye = Eye;
myAng = Angle;
myCosAng = Cos(PI/2.+Angle);
myCosAng = Cos(M_PI/2.+Angle);
}
inline void Contap_SurfFunction::Set(const Standard_Real Tolerance)