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

4
src/GeomConvert/GeomConvert.cxx
View File

@@ -393,7 +393,7 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
else if ( Parameterisation == Convert_QuasiAngular) {
Convert_EllipseToBSplineCurve Convert (E2d,
0.0e0,
2.0e0 * PI,
2.0e0 * M_PI,
Parameterisation);
TheCurve = BSplineCurveBuilder (TheConic, Convert);
@@ -417,7 +417,7 @@ Handle(Geom_BSplineCurve) GeomConvert::CurveToBSplineCurve
else if ( Parameterisation == Convert_QuasiAngular) {
Convert_CircleToBSplineCurve Convert (C2d,
0.0e0,
2.0e0 * PI,
2.0e0 * M_PI,
Parameterisation);
TheCurve = BSplineCurveBuilder (TheConic, Convert);

6
src/GeomConvert/GeomConvert_1.cxx
View File

@@ -525,14 +525,14 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface
if (Strim->IsUPeriodic()) {
NbUKnots = 4;
nbUSpans = 3;
AlfaU = PI / 3.;
AlfaU = M_PI / 3.;
NbUPoles = 6;
periodic = Standard_True;
}
else {
// Nombre de spans : ouverture maximale = 150 degres ( = PI / 1.2 rds)
nbUSpans =
(Standard_Integer)IntegerPart( 1.2 * (ULast - UFirst) / PI) + 1;
(Standard_Integer)IntegerPart( 1.2 * (ULast - UFirst) / M_PI) + 1;
AlfaU = (ULast - UFirst) / ( nbUSpans * 2);
NbUPoles = 2 * nbUSpans + 1;
NbUKnots = nbUSpans + 1;
@@ -756,7 +756,7 @@ Handle(BSplineSurface) GeomConvert::SplitBSplineSurface
Standard_Real AlfaU;
NbUKnots = 4;
nbUSpans = 3;
AlfaU = PI / 3.;
AlfaU = M_PI / 3.;
NbUPoles = 6;
// Compute Knots and Mults