0021196: [CEA 456] Integration and merge modification for debian packages

Rename PPC variable, this is a macro on PowerPC

diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index d0ac43e7cd89e8b5f78151ae3c2bde92a23e3ae5..74e6a87451d23bf2e3b2e49fd873790f25510c44 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -1980,10 +1980,10 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
     OCC_CATCH_SIGNALS;
 #endif
-    GeomAPI_ProjectPointOnCurve PPC(aPoint, aCurve, aFP, aLP);
-    if(PPC.NbPoints()>0) {
+    GeomAPI_ProjectPointOnCurve PPCurve(aPoint, aCurve, aFP, aLP);
+    if(PPCurve.NbPoints()>0) {
       GeomLProp_CLProps Prop = GeomLProp_CLProps 
-        (aCurve, PPC.LowerDistanceParameter(), 2, Precision::Confusion());
+        (aCurve, PPCurve.LowerDistanceParameter(), 2, Precision::Confusion());
       aRes = fabs(Prop.Curvature());
       SetErrorCode(OK);
     }

diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
index 87a0e5e164bcc44614a79d56a716e362efb9daa3..aef2c9d33c77c5da733ddf4e59f66ec5fea2dfb1 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
@@ -760,10 +760,10 @@ static TopoDS_Shape CreatePipeForShellSections(const TopoDS_Wire& aWirePath,
         // find distance between E and aLocs(jcurr)
         double fp,lp;
         Handle(Geom_Curve) C = BRep_Tool::Curve(E,fp,lp);
-        GeomAPI_ProjectPointOnCurve PPC (PLocs.Value(jcurr),C);
-        if( PPC.NbPoints()>0 &&
-            PLocs.Value(jcurr).Distance(PPC.Point(1)) < tol ) {
-          double param = PPC.Parameter(1);
+        GeomAPI_ProjectPointOnCurve PPCurve (PLocs.Value(jcurr),C);
+        if( PPCurve.NbPoints()>0 &&
+            PLocs.Value(jcurr).Distance(PPCurve.Point(1)) < tol ) {
+          double param = PPCurve.Parameter(1);
           gp_Pnt PC1;
           C->D0(param,PC1);
           // split current edge
@@ -2148,10 +2148,10 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const
           // find distance between E and aLocs(jcurr)
           double fp,lp;
           Handle(Geom_Curve) C = BRep_Tool::Curve(E,fp,lp);
-          GeomAPI_ProjectPointOnCurve PPC (PLocs.Value(jcurr),C);
-          if( PPC.NbPoints()>0 &&
-              PLocs.Value(jcurr).Distance(PPC.Point(1)) < tol ) {
-            double param = PPC.Parameter(1);
+          GeomAPI_ProjectPointOnCurve PPCurve (PLocs.Value(jcurr),C);
+          if( PPCurve.NbPoints()>0 &&
+              PLocs.Value(jcurr).Distance(PPCurve.Point(1)) < tol ) {
+            double param = PPCurve.Parameter(1);
             gp_Pnt PC1;
             C->D0(param,PC1);
             // split current edge