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

14
src/GccIter/GccIter_Circ2d2TanOn.gxx
View File

@@ -374,7 +374,7 @@ GccIter_Circ2d2TanOn::
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = Param3;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = 1.e-15;
tol(4) = Tol/10.;
@@ -491,9 +491,9 @@ GccIter_Circ2d2TanOn::
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = Param3;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = 2.e-15*PI;
tol(3) = 2.e-15*M_PI;
tol(4) = Tol/10.;
gp_Pnt2d point1 = ElCLib::Value(Param1,C1);
gp_Pnt2d point2 = TheCurveTool::Value(Cu2,Param2);
@@ -607,7 +607,7 @@ GccIter_Circ2d2TanOn::
Ufirst(3) = Param3;
tol(1) = 1.e-15;
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = 2.e-15*PI;
tol(3) = 2.e-15*M_PI;
tol(4) = Tol/10.;
gp_Pnt2d point1 = ElCLib::Value(Param1,L1);
gp_Pnt2d point2 = TheCurveTool::Value(Cu2,Param2);
@@ -720,7 +720,7 @@ GccIter_Circ2d2TanOn::
Ufirst(3) = Param3;
tol(1) = TheCurveTool::EpsX(Cu1,Abs(Tolerance));
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = 2.e-15*PI;
tol(3) = 2.e-15*M_PI;
tol(4) = Tol/10.;
gp_Pnt2d point1 = TheCurveTool::Value(Cu1,Param1);
gp_Pnt2d point2 = TheCurveTool::Value(Cu2,Param2);
@@ -826,7 +826,7 @@ GccIter_Circ2d2TanOn::
Ufirst(1) = Param1;
Ufirst(2) = Param2;
tol(1) = TheCurveTool::EpsX(Cu1,Abs(Tolerance));
tol(2) = 2.e-15*PI;
tol(2) = 2.e-15*M_PI;
tol(3) = Tol/10.;
gp_Pnt2d point1 = TheCurveTool::Value(Cu1,Param1);
gp_Pnt2d point3 = ElCLib::Value(Param2,OnCirc);
@@ -1029,7 +1029,7 @@ GccIter_Circ2d2TanOn::
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = ParamOn;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = TheCurveTool::EpsX(OnCurv,Abs(Tolerance));
tol(4) = Tol/10.;;

48
src/GccIter/GccIter_Circ2d3Tan.gxx
View File

@@ -191,13 +191,13 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(2) = TheCurveTool::FirstParameter(Cu2);
Umin(3) = TheCurveTool::FirstParameter(Cu3);
Umax(1) = 2*PI;
Umax(1) = 2*M_PI;
Umax(2) = TheCurveTool::LastParameter(Cu2);
Umax(3) = TheCurveTool::LastParameter(Cu3);
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = Param3;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
tol(3) = TheCurveTool::EpsX(Cu3,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
@@ -323,14 +323,14 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(2) = 0.;
Umin(3) = TheCurveTool::FirstParameter(Cu3);
Umax(1) = 2*PI;
Umax(2) = 2*PI;
Umax(1) = 2*M_PI;
Umax(2) = 2*M_PI;
Umax(3) = TheCurveTool::LastParameter(Cu3);
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = Param3;
tol(1) = 2.e-15*PI;
tol(2) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = 2.e-15*M_PI;
tol(3) = TheCurveTool::EpsX(Cu3,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
if (Root.IsDone()) {
@@ -721,13 +721,13 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(2) = TheCurveTool::FirstParameter(Cu1);
Umin(3) = TheCurveTool::FirstParameter(Cu2);
Umax(1) = 2*PI;
Umax(1) = 2*M_PI;
Umax(2) = TheCurveTool::LastParameter(Cu1);
Umax(3) = TheCurveTool::LastParameter(Cu2);
Ufirst(1) = PI;
Ufirst(1) = M_PI;
Ufirst(2) = Param1;
Ufirst(3) = Param2;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = TheCurveTool::EpsX(Cu1,Abs(Tolerance));
tol(3) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
@@ -838,14 +838,14 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(2) = 0.;
Umin(3) = TheCurveTool::FirstParameter(Cu1);
Umax(1) = 2*PI;
Umax(2) = 2*PI;
Umax(1) = 2*M_PI;
Umax(2) = 2*M_PI;
Umax(3) = TheCurveTool::LastParameter(Cu1);
Ufirst(1) = PI;
Ufirst(2) = PI;
Ufirst(1) = M_PI;
Ufirst(2) = M_PI;
Ufirst(3) = Param1;
tol(1) = 2.e-15*PI;
tol(2) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = 2.e-15*M_PI;
tol(3) = TheCurveTool::EpsX(Cu1,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
if (Root.IsDone()) {
@@ -954,10 +954,10 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umax(2) = RealLast();
Umax(3) = TheCurveTool::LastParameter(Cu2);
Umax(1) = 2*PI;
Umax(1) = 2*M_PI;
Ufirst(2) = Param1;
Ufirst(3) = Param2;
Ufirst(1) = PI;
Ufirst(1) = M_PI;
tol(1) = 2.e-15;
tol(2) = 1.e-15;
tol(3) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
@@ -1075,13 +1075,13 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(2) = RealFirst();
Umin(3) = TheCurveTool::FirstParameter(Cu3);
Umax(1) = 2*PI;
Umax(1) = 2*M_PI;
Umax(2) = RealLast();
Umax(3) = TheCurveTool::LastParameter(Cu3);
Ufirst(1) = Param1;
Ufirst(2) = Param2;
Ufirst(3) = Param3;
tol(1) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = 1.e-15;
tol(3) = TheCurveTool::EpsX(Cu3,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
@@ -1206,14 +1206,14 @@ GccIter_Circ2d3Tan::
Umin(1) = 0.;
Umin(3) = TheCurveTool::FirstParameter(Cu2);
Umin(2) = 0.;
Umax(1) = 2*PI;
Umax(1) = 2*M_PI;
Umax(3) = TheCurveTool::LastParameter(Cu2);
Umax(2) = 2*PI;
Umax(2) = 2*M_PI;
Ufirst(1) = Param1;
Ufirst(2) = PI;
Ufirst(2) = M_PI;
Ufirst(3) = Param2;
tol(1) = 2.e-15*PI;
tol(2) = 2.e-15*PI;
tol(1) = 2.e-15*M_PI;
tol(2) = 2.e-15*M_PI;
tol(3) = TheCurveTool::EpsX(Cu2,Abs(Tolerance));
math_FunctionSetRoot Root(Func,Ufirst,tol,Umin,Umax);
if (Root.IsDone()) {

6
src/GccIter/GccIter_Lin2dTanObl.gxx
View File

@@ -42,12 +42,12 @@ GccIter_Lin2dTanObl::
Standard_Real B = Dir.Y();
gp_Dir2d TheDirection(Dir);
if (Abs(Angle) > Abs(TolAng)) {
if (Abs(Abs(Angle)-PI) <= Abs(TolAng)) {
if (Abs(Abs(Angle)-M_PI) <= Abs(TolAng)) {
Paral2 = Standard_True;
TheDirection = Dir.Reversed();
}
else if (Abs(Angle-PI/2) <= Abs(TolAng)) { TheDirection=gp_Dir2d(-B,A); }
else if (Abs(Angle+PI/2) <= Abs(TolAng)) { TheDirection=gp_Dir2d(B,-A); }
else if (Abs(Angle-M_PI/2) <= Abs(TolAng)) { TheDirection=gp_Dir2d(-B,A); }
else if (Abs(Angle+M_PI/2) <= Abs(TolAng)) { TheDirection=gp_Dir2d(B,-A); }
else {
TheDirection=gp_Dir2d(A*Cos(Angle)-B*Sin(Angle),
A*Sin(Angle)+B*Cos(Angle));