From 9e0ddec00acaabab95d13de63c862d70924adbdd Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 3 Jan 2018 14:31:52 +0100 Subject: [PATCH] port to occ 7.2.1 --- src/Mod/Part/App/TopoShape.cpp | 5 +++++ src/Mod/Part/Gui/TaskCheckGeometry.cpp | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index ebc6ad31ea..ae14f9f133 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -1396,8 +1396,13 @@ bool TopoShape::analyze(bool runBopCheck, std::ostream& str) const for (; BOPResultsIt.More(); BOPResultsIt.Next()) { const BOPAlgo_CheckResult ¤t = BOPResultsIt.Value(); +#if OCC_VERSION_HEX < 0x070000 + const BOPCol_ListOfShape &faultyShapes1 = current.GetFaultyShapes1(); + BOPCol_ListIteratorOfListOfShape faultyShapes1It(faultyShapes1); +#else const TopTools_ListOfShape &faultyShapes1 = current.GetFaultyShapes1(); TopTools_ListIteratorOfListOfShape faultyShapes1It(faultyShapes1); +#endif for (;faultyShapes1It.More(); faultyShapes1It.Next()) { const TopoDS_Shape &faultyShape = faultyShapes1It.Value(); str << "Error in " << shapeEnumToString[faultyShape.ShapeType()] << ": "; diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index 075663ac36..c382c174d3 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -642,8 +642,13 @@ int TaskCheckGeometryResults::goBOPSingleCheck(const TopoDS_Shape& shapeIn, Resu { const BOPAlgo_CheckResult ¤t = BOPResultsIt.Value(); +#if OCC_VERSION_HEX < 0x070000 + const BOPCol_ListOfShape &faultyShapes1 = current.GetFaultyShapes1(); + BOPCol_ListIteratorOfListOfShape faultyShapes1It(faultyShapes1); +#else const TopTools_ListOfShape &faultyShapes1 = current.GetFaultyShapes1(); TopTools_ListIteratorOfListOfShape faultyShapes1It(faultyShapes1); +#endif for (;faultyShapes1It.More(); faultyShapes1It.Next()) { const TopoDS_Shape &faultyShape = faultyShapes1It.Value();