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

6
src/ElSLib/ElSLib.cxx
View File

@@ -14,7 +14,7 @@
#include <gp_XYZ.hxx>
#include <gp_Trsf.hxx>
static Standard_Real PIPI = PI + PI;
static Standard_Real PIPI = M_PI + M_PI;
gp_Pnt ElSLib::PlaneValue (const Standard_Real U,
const Standard_Real V,
@@ -147,7 +147,7 @@ gp_Vec ElSLib::ConeDN (const Standard_Real U,
{
gp_XYZ Xdir = Pos.XDirection().XYZ();
gp_XYZ Ydir = Pos.YDirection().XYZ();
Standard_Real Um = U + Nu * M_PI_2; // PI * 0.5
Standard_Real Um = U + Nu * M_PI_2; // M_PI * 0.5
Xdir.Multiply(cos(Um));
Ydir.Multiply(sin(Um));
Xdir.Add(Ydir);
@@ -1450,7 +1450,7 @@ void ElSLib::TorusParameters(const gp_Ax3& Pos,
if (AD1 < 0) AD1 = - AD1;
Standard_Real AD2 = D2;
if (AD2 < 0) AD2 = - AD2;
if (AD2 < AD1) U += PI;
if (AD2 < AD1) U += M_PI;
}
if (U < -1.e-16) U += PIPI;
else if (U < 0) U = 0;