diff --git a/src/Mod/Mesh/App/FacetPyImp.cpp b/src/Mod/Mesh/App/FacetPyImp.cpp index a58971a54..f69eeb66f 100644 --- a/src/Mod/Mesh/App/FacetPyImp.cpp +++ b/src/Mod/Mesh/App/FacetPyImp.cpp @@ -76,15 +76,10 @@ PyObject* FacetPy::unbound(PyObject *args) getFacetPtr()->Mesh = 0; Py_Return; } -#if PY_MAJOR_VERSION >= 3 + Py::Long FacetPy::getIndex(void) const { return Py::Long((long) getFacetPtr()->Index); -#else -Py::Int FacetPy::getIndex(void) const -{ - return Py::Int((long) getFacetPtr()->Index); -#endif } Py::Boolean FacetPy::getBound(void) const diff --git a/src/Mod/Mesh/App/MeshPointPyImp.cpp b/src/Mod/Mesh/App/MeshPointPyImp.cpp index e58a92d59..5e3953c09 100644 --- a/src/Mod/Mesh/App/MeshPointPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPointPyImp.cpp @@ -100,15 +100,9 @@ PyObject* MeshPointPy::move(PyObject *args) Py_Return; } -#if PY_MAJOR_VERSION >= 3 Py::Long MeshPointPy::getIndex(void) const { return Py::Long((long) getMeshPointPtr()->Index); -#else -Py::Int MeshPointPy::getIndex(void) const -{ - return Py::Int((long) getMeshPointPtr()->Index); -#endif } Py::Boolean MeshPointPy::getBound(void) const diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp index a2dde83b3..cc44ef83e 100644 --- a/src/Mod/Mesh/App/MeshPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPyImp.cpp @@ -1766,7 +1766,7 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args) return Py::new_reference_to(list); } -#if PY_MAJOR_VERSION >= 3 + Py::Long MeshPy::getCountPoints(void) const { return Py::Long((long)getMeshObjectPtr()->countPoints()); @@ -1781,22 +1781,6 @@ Py::Long MeshPy::getCountFacets(void) const { return Py::Long((long)getMeshObjectPtr()->countFacets()); } -#else -Py::Int MeshPy::getCountPoints(void) const -{ - return Py::Int((long)getMeshObjectPtr()->countPoints()); -} - -Py::Int MeshPy::getCountEdges(void) const -{ - return Py::Int((long)getMeshObjectPtr()->countEdges()); -} - -Py::Int MeshPy::getCountFacets(void) const -{ - return Py::Int((long)getMeshObjectPtr()->countFacets()); -} -#endif Py::Float MeshPy::getArea(void) const { diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index ad19e9ba5..e6873efdc 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -150,7 +150,7 @@ private: std::vector segm; segm.reserve(list.size()); for (unsigned int i=0; i > bounds;