From e8048a496845165b154533e586e1ce2d4a4a78b0 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 5 Nov 2015 19:40:34 +0100 Subject: [PATCH] + fix build failure with occ 6.9.1 --- src/Mod/Part/App/TopoShapePyImp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp index 91564b2a7..644088fe3 100644 --- a/src/Mod/Part/App/TopoShapePyImp.cpp +++ b/src/Mod/Part/App/TopoShapePyImp.cpp @@ -38,7 +38,6 @@ # include #if OCC_VERSION_HEX >= 0x060801 # include -# include #endif # include # include @@ -1700,6 +1699,9 @@ PyObject* _getSupportIndex(char* suppStr, TopoShape* ts, TopoDS_Shape suppShape) PyObject* TopoShapePy::proximity(PyObject *args) { #if OCC_VERSION_HEX >= 0x060801 +#if OCC_VERSION_HEX >= 0x060901 + typedef BRepExtrema_MapOfIntegerPackedMapOfInteger BRepExtrema_OverlappedSubShapes; +#endif PyObject* ps2; Standard_Real tol = Precision::Confusion(); if (!PyArg_ParseTuple(args, "O!|d",&(TopoShapePy::Type), &ps2, &tol)) @@ -1715,7 +1717,7 @@ PyObject* TopoShapePy::proximity(PyObject *args) return 0; } - BRepExtrema_ShapeProximity proximity;getTopoShapePtr()->_Shape; + BRepExtrema_ShapeProximity proximity; proximity.LoadShape1 (s1); proximity.LoadShape2 (s2); if (tol > 0.0)