OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

8
src/ShapeCustom/ShapeCustom_BSplineRestriction.cxx
View File

@@ -594,8 +594,8 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo
Abs(v1-VF) > Precision::PConfusion() || Abs(v2- VL) > Precision::PConfusion()) {
/*if(aSurf->IsUPeriodic() ) {
Standard_Real aDelta = (UL > UF ? UL - UF : UF - UL );
u1 = (aDelta > 2.*PI ? 0. : UF + ShapeAnalysis::AdjustByPeriod(UF,0.5*(UL+UF),2*PI));
u2 = (aDelta > 2.*PI ? 2.*PI : u1 + aDelta);
u1 = (aDelta > 2.*M_PI ? 0. : UF + ShapeAnalysis::AdjustByPeriod(UF,0.5*(UL+UF),2*M_PI));
u2 = (aDelta > 2.*M_PI ? 2.*M_PI : u1 + aDelta);
}*/
Standard_Boolean isTrim = Standard_False;
if(!aSurf->IsUPeriodic() ) { //else {
@@ -605,8 +605,8 @@ Standard_Boolean ShapeCustom_BSplineRestriction::ConvertSurface(const Handle(Geo
/*if(aSurf->IsVPeriodic()) {
Standard_Real aDelta = (VL > VF ? VL - VF : VF - VL );
v1 = (aDelta > 2.*PI ? 0. : VF + ShapeAnalysis::AdjustByPeriod(VF,0.5*(UL+UF),2*PI)); ;
v2 = (aDelta > 2.*PI ? 2.* PI : v1 + aDelta);
v1 = (aDelta > 2.*M_PI ? 0. : VF + ShapeAnalysis::AdjustByPeriod(VF,0.5*(UL+UF),2*M_PI)); ;
v2 = (aDelta > 2.*M_PI ? 2.* M_PI : v1 + aDelta);
}*/
if(!aSurf->IsVPeriodic()) {//else
v1 = Max(v1,VF); v2 = Min(v2,VL);

4
src/ShapeCustom/ShapeCustom_ConvertToRevolution.cxx
View File

@@ -93,7 +93,7 @@ Standard_Boolean ShapeCustom_ConvertToRevolution::NewSurface (const TopoDS_Face&
Handle(Geom_SphericalSurface) SS = Handle(Geom_SphericalSurface)::DownCast(ES);
gp_Ax2 Ax2 ( pos, X ^ dir, X );
Handle(Geom_Circle) Circ = new Geom_Circle ( Ax2, SS->Radius() );
BasisCurve = new Geom_TrimmedCurve ( Circ, -PI/2., PI/2. );
BasisCurve = new Geom_TrimmedCurve ( Circ, -M_PI/2., M_PI/2. );
}
else if ( ES->IsKind(STANDARD_TYPE(Geom_ToroidalSurface)) ) {
Handle(Geom_ToroidalSurface) TS = Handle(Geom_ToroidalSurface)::DownCast(ES);
@@ -221,7 +221,7 @@ Standard_Boolean ShapeCustom_ConvertToRevolution::NewCurve2d (const TopoDS_Edge&
// for spherical surface, surface of revolution since based on TrimmedCurve
// has V parametrisation shifted on 2PI; translate pcurve accordingly
if ( ! ES.IsNull() && ES->IsKind(STANDARD_TYPE(Geom_SphericalSurface)) ) {
gp_Vec2d shift ( 0., 2*PI );
gp_Vec2d shift ( 0., 2*M_PI );
C->Translate ( shift );
}
}