diff --git a/src/Mod/Points/App/PointsPyImp.cpp b/src/Mod/Points/App/PointsPyImp.cpp index e0768e373..65d3463fe 100644 --- a/src/Mod/Points/App/PointsPyImp.cpp +++ b/src/Mod/Points/App/PointsPyImp.cpp @@ -227,15 +227,9 @@ PyObject* PointsPy::fromValid(PyObject * args) } } -#if PY_MAJOR_VERSION >= 3 Py::Long PointsPy::getCountPoints(void) const { return Py::Long((long)getPointKernelPtr()->size()); -#else -Py::Int PointsPy::getCountPoints(void) const -{ - return Py::Int((long)getPointKernelPtr()->size()); -#endif } Py::List PointsPy::getPoints(void) const diff --git a/src/Mod/Robot/App/WaypointPyImp.cpp b/src/Mod/Robot/App/WaypointPyImp.cpp index f69424b4d..aca749576 100644 --- a/src/Mod/Robot/App/WaypointPyImp.cpp +++ b/src/Mod/Robot/App/WaypointPyImp.cpp @@ -218,7 +218,6 @@ void WaypointPy::setCont(Py::Boolean arg) getWaypointPtr()->Cont = (bool)arg; } -#if PY_MAJOR_VERSION >= 3 Py::Long WaypointPy::getTool(void) const { return Py::Long((long)getWaypointPtr()->Tool); @@ -246,35 +245,6 @@ void WaypointPy::setBase(Py::Long arg) else throw Py::ValueError("negative base not allowed!"); } -#else -Py::Int WaypointPy::getTool(void) const -{ - return Py::Int((long)getWaypointPtr()->Tool); -} - -void WaypointPy::setTool(Py::Int arg) -{ - long value = static_cast(arg); - if (value >= 0) - getWaypointPtr()->Tool = value; - else - throw Py::ValueError("negative tool not allowed!"); -} - -Py::Int WaypointPy::getBase(void) const -{ - return Py::Int((long)getWaypointPtr()->Base); -} - -void WaypointPy::setBase(Py::Int arg) -{ - long value = static_cast(arg); - if (value >= 0) - getWaypointPtr()->Base = value; - else - throw Py::ValueError("negative base not allowed!"); -} -#endif PyObject *WaypointPy::getCustomAttributes(const char* /*attr*/) const {