OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +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/DDataStd/DDataStd.cxx
View File

@@ -60,7 +60,7 @@ void DDataStd::DumpConstraint (const Handle(TDataXtd_Constraint)& CTR, Standard_
TDataStd_RealEnum t = CTR->GetValue()->GetDimension();
TDataStd::Print(t,anOS);
Standard_Real val = CTR->GetValue()->Get();
if (t == TDataStd_ANGULAR) val = (180.*val)/PI;
if (t == TDataStd_ANGULAR) val = (180.*val)/M_PI;
anOS << " ";
anOS << val;
}

2
src/DDataStd/DDataStd_DatumCommands.cxx
View File

@@ -192,7 +192,7 @@ static Standard_Integer DDataStd_SetPlane (Draw_Interpretor& di,
// Standard_Real ang = atof(arg[9]);
// T.SetRotation(gp_Ax1(gp_Pnt(x,y,z),
// gp_Vec(dx,dy,dz)),
// ang * PI180);
// ang * (M_PI / 180.0));
// }
// Loc = T;
// }

2
src/DDataStd/DDataStd_DrawDriver.cxx
View File

@@ -355,7 +355,7 @@ Handle(Draw_Drawable3D) DDataStd_DrawDriver::DrawableConstraint (const Handle(TD
if (!D.IsNull()) {
if (!A->GetValue().IsNull()) {
Standard_Real val = A->GetValue()->Get();
if (A->GetValue()->GetDimension() == TDataStd_ANGULAR) val = (180.*val)/PI;
if (A->GetValue()->GetDimension() == TDataStd_ANGULAR) val = (180.*val)/M_PI;
D->SetValue(val);
}
// unverified constraints are red (default is white)

2
src/DDataStd/DDataStd_Sample.cxx
View File

@@ -79,7 +79,7 @@ static void Sample()
// Filling array
for(Standard_Integer j = realarray->Lower(); j<= realarray->Upper(); j++) {
realarray->SetValue(j, Standard_PI*j);
realarray->SetValue(j, M_PI * j);
}
// Getting length of array