diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index f96b1e6826bf..1a1cd24f6f20 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -84,11 +84,5 @@ #include #endif -#if defined(OCC_VERSION_MAJOR) && defined(OCC_VERSION_MINOR) && defined(OCC_VERSION_MAINTENANCE) -# define OCC_HEX_VERSION ((OCC_VERSION_MAJOR<<16)+(OCC_VERSION_MINOR<<8)+(OCC_VERSION_MAINTENANCE)) -#else -# define OCC_HEX_VERSION 0x050000 // use an old version -#endif - #endif diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp index 1a3c0c7e3744..32ccbb38bf4c 100644 --- a/src/Mod/Part/App/PrimitiveFeature.cpp +++ b/src/Mod/Part/App/PrimitiveFeature.cpp @@ -282,7 +282,7 @@ App::DocumentObjectExecReturn *Plane::execute(void) case BRepBuilderAPI_ParametersOutOfRange: error = "parameters out of range"; break; -#if OCC_HEX_VERSION < 0x060500 +#if OCC_VERSION_HEX < 0x060500 case BRepBuilderAPI_SurfaceNotC2: error = "surface not C2"; break; diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 35d737531986..eb234a1acdd7 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -183,7 +183,7 @@ const char* BRepBuilderAPI_FaceErrorText(BRepBuilderAPI_FaceError et) return "Curve projection failed"; case BRepBuilderAPI_ParametersOutOfRange: return "Parameters out of range"; -#if OCC_HEX_VERSION < 0x060500 +#if OCC_VERSION_HEX < 0x060500 case BRepBuilderAPI_SurfaceNotC2: return "Surface not C2-continous"; #endif @@ -620,16 +620,16 @@ void TopoShape::importBrep(const char *FileName) // read brep-file BRep_Builder aBuilder; TopoDS_Shape aShape; - #if OCC_HEX_VERSION >= 0x060300 +#if OCC_VERSION_HEX >= 0x060300 Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); pi->NewScope(100, "Reading BREP file..."); pi->Show(); QString fn = QString::fromUtf8(FileName); BRepTools::Read(aShape,(const char*)fn.toLocal8Bit(),aBuilder,pi); pi->EndScope(); - #else +#else BRepTools::Read(aShape,(const Standard_CString)FileName,aBuilder); - #endif +#endif this->_Shape = aShape; } catch (Standard_Failure) { @@ -644,7 +644,7 @@ void TopoShape::importBrep(std::istream& str) // read brep-file BRep_Builder aBuilder; TopoDS_Shape aShape; -#if OCC_HEX_VERSION >= 0x060300 +#if OCC_VERSION_HEX >= 0x060300 Handle_Message_ProgressIndicator pi = new ProgressIndicator(100); pi->NewScope(100, "Reading BREP file..."); pi->Show(); diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index 036598bae783..102c4f81eb41 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -215,7 +215,7 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) case BRepBuilderAPI_ParametersOutOfRange: Standard_Failure::Raise("Parameters out of range"); break; -#if OCC_HEX_VERSION < 0x060500 +#if OCC_VERSION_HEX < 0x060500 case BRepBuilderAPI_SurfaceNotC2: Standard_Failure::Raise("Surface not C2"); break; diff --git a/src/Mod/Part/App/TopoShapeShellPyImp.cpp b/src/Mod/Part/App/TopoShapeShellPyImp.cpp index 743d8e3b1806..ffe898ba5f4d 100644 --- a/src/Mod/Part/App/TopoShapeShellPyImp.cpp +++ b/src/Mod/Part/App/TopoShapeShellPyImp.cpp @@ -155,7 +155,7 @@ PyObject* TopoShapeShellPy::getFreeEdges(PyObject *args) return NULL; ShapeAnalysis_Shell as; as.LoadShells(getTopoShapePtr()->_Shape); -#if OCC_HEX_VERSION < 0x060500 +#if OCC_VERSION_HEX < 0x060500 as.CheckOrientedShells(getTopoShapePtr()->_Shape, Standard_True); #else as.CheckOrientedShells(getTopoShapePtr()->_Shape, Standard_True, Standard_True); @@ -170,7 +170,7 @@ PyObject* TopoShapeShellPy::getBadEdges(PyObject *args) return NULL; ShapeAnalysis_Shell as; as.LoadShells(getTopoShapePtr()->_Shape); -#if OCC_HEX_VERSION < 0x060500 +#if OCC_VERSION_HEX < 0x060500 as.CheckOrientedShells(getTopoShapePtr()->_Shape, Standard_True); #else as.CheckOrientedShells(getTopoShapePtr()->_Shape, Standard_True, Standard_True);