OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +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

10
src/Convert/Convert_ConeToBSplineSurface.cxx
View File

@@ -28,7 +28,7 @@ static void ComputePoles( const Standard_Real R,
// Number of spans : maximum opening = 150 degrees ( = PI / 1.2 rds)
Standard_Integer
nbUSpans = (Standard_Integer)IntegerPart( 1.2 * deltaU / PI) + 1;
nbUSpans = (Standard_Integer)IntegerPart( 1.2 * deltaU / M_PI) + 1;
Standard_Real AlfaU = deltaU / ( nbUSpans * 2);
Standard_Real x[TheNbVPoles];
@@ -78,7 +78,7 @@ Convert_ConeToBSplineSurface::Convert_ConeToBSplineSurface
{
Standard_Real deltaU = U2 - U1;
Standard_DomainError_Raise_if( (Abs(V2-V1) <= Abs(Epsilon(V1))) ||
(deltaU > 2*PI) ||
(deltaU > 2*M_PI) ||
(deltaU < 0. ),
"Convert_ConeToBSplineSurface");
@@ -90,7 +90,7 @@ Convert_ConeToBSplineSurface::Convert_ConeToBSplineSurface
// Number of spans : maximum opening = 150 degrees ( = PI / 1.2 rds)
Standard_Integer
nbUSpans = (Standard_Integer)IntegerPart( 1.2 * deltaU / PI) + 1;
nbUSpans = (Standard_Integer)IntegerPart( 1.2 * deltaU / M_PI) + 1;
Standard_Real AlfaU = deltaU / ( nbUSpans * 2);
nbUPoles = 2 * nbUSpans + 1;
@@ -156,7 +156,7 @@ Convert_ConeToBSplineSurface::Convert_ConeToBSplineSurface
Standard_Real R = C.RefRadius();
Standard_Real A = C.SemiAngle();
ComputePoles( R, A, 0., 2.*PI, V1, V2, poles);
ComputePoles( R, A, 0., 2.*M_PI, V1, V2, poles);
nbUPoles = 6;
nbUKnots = 4;
@@ -164,7 +164,7 @@ Convert_ConeToBSplineSurface::Convert_ConeToBSplineSurface
nbVKnots = 2;
for ( i = 1; i <= nbUKnots; i++) {
uknots(i) = ( i-1) * 2. * PI /3.;
uknots(i) = ( i-1) * 2. * M_PI /3.;
umults(i) = 2;
}
vknots(1) = V1; vmults(1) = 2;