OCCT dev version porting (6.7.2)

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_AlgoTools.cxx

diff --git a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
index 3b550941dcff4080dd8972fe9e99f8c3afa804a0..5adf8979d16469e38b668a639c73267c527e6851 100755 (executable)
--- a/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_AlgoTools.cxx
@@ -25,6 +25,8 @@
 
 #include <GEOMAlgo_AlgoTools.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
 #include <gp_Pnt.hxx>
 #include <gp_Pnt2d.hxx>
 #include <gp_Dir2d.hxx>
@@ -195,7 +197,12 @@ Standard_Integer GEOMAlgo_AlgoTools::BuildPCurveForEdgeOnFace
   (const TopoDS_Edge& aEold,
    const TopoDS_Edge& aEnew,
    const TopoDS_Face& aF,
-   const Handle(BOPInt_Context)& aCtx)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aCtx
+#else
+   const Handle(BOPInt_Context)& aCtx
+#endif
+   )
 {
   Standard_Boolean bIsClosed, bUClosed, bHasOld;
   Standard_Integer iRet, aNbPoints;
@@ -426,7 +433,12 @@ void GEOMAlgo_AlgoTools::RefinePCurveForEdgeOnFace(const TopoDS_Edge& aE,
 Standard_Boolean GEOMAlgo_AlgoTools::IsSplitToReverse
   (const TopoDS_Edge& aEF1,
    const TopoDS_Edge& aEF2,
-   const Handle(BOPInt_Context)& aContext)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aContext
+#else
+   const Handle(BOPInt_Context)& aContext
+#endif
+   )
 {
   Standard_Boolean aFlag;
   Standard_Real aT1, aT2, aScPr, a, b;
@@ -471,7 +483,12 @@ Standard_Boolean GEOMAlgo_AlgoTools::ProjectPointOnShape
   (const gp_Pnt& aP1,
    const TopoDS_Shape& aS,
    gp_Pnt& aP2,
-   const Handle(BOPInt_Context)& aCtx)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aCtx
+#else
+   const Handle(BOPInt_Context)& aCtx
+#endif
+   )
 {
   Standard_Boolean bIsDone = Standard_False;
   Standard_Real aT2;
@@ -618,7 +635,12 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
    const TopTools_ListOfShape& aLE,
    const Standard_Real aTol,
    TopTools_ListOfShape& aLESD,
-   const Handle(BOPInt_Context)& aCtx)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aCtx
+#else
+   const Handle(BOPInt_Context)& aCtx
+#endif
+   )
 {
   Standard_Boolean bIsDone;
   Standard_Real aTol2, aD2;
@@ -657,7 +679,12 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
   (const TopTools_ListOfShape& aLE,
    const Standard_Real aTol,
    TopTools_IndexedDataMapOfShapeListOfShape& aMEE,
-   const Handle(BOPInt_Context)& aCtx)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aCtx
+#else
+   const Handle(BOPInt_Context)& aCtx
+#endif
+   )
 {
   Standard_Integer aNbE, aNbEProcessed, aNbESD, iErr;
   TopTools_ListOfShape aLESD;
@@ -725,7 +752,12 @@ Standard_Integer GEOMAlgo_AlgoTools::FindSDShapes
 Standard_Integer GEOMAlgo_AlgoTools::RefineSDShapes
   (GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape& aMPKLE,
    const Standard_Real aTol,
-   const Handle(BOPInt_Context)& aCtx)
+#if OCC_VERSION_LARGE > 0x06070100
+   const Handle(IntTools_Context)& aCtx
+#else
+   const Handle(BOPInt_Context)& aCtx
+#endif
+   )
 {
   Standard_Integer i, aNbE, iErr, j, aNbEE, aNbToAdd;
   TopTools_IndexedDataMapOfShapeListOfShape aMEE, aMSDE, aMEToAdd;