From 65bcaf4b6e06b3e9fa2d8b92070a0ab9c45a45cd Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 22 Sep 2016 16:46:18 +0200 Subject: [PATCH] fix -Wextra in Measure --- src/Mod/Measure/App/AppMeasure.cpp | 2 +- src/Mod/Measure/App/Measurement.cpp | 2 +- src/Mod/Measure/App/MeasurementPyImp.cpp | 33 ++++++++++++++++++------ 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/Mod/Measure/App/AppMeasure.cpp b/src/Mod/Measure/App/AppMeasure.cpp index 2de521782..af51864e9 100644 --- a/src/Mod/Measure/App/AppMeasure.cpp +++ b/src/Mod/Measure/App/AppMeasure.cpp @@ -33,7 +33,7 @@ struct PyMethodDef Measure_methods[] = { // {"read" , read, 1}, - {NULL, NULL} /* end of table marker */ + {NULL, NULL, 0, NULL} /* end of table marker */ }; diff --git a/src/Mod/Measure/App/Measurement.cpp b/src/Mod/Measure/App/Measurement.cpp index 7e7b5beac..57a4a9838 100644 --- a/src/Mod/Measure/App/Measurement.cpp +++ b/src/Mod/Measure/App/Measurement.cpp @@ -291,7 +291,7 @@ double Measurement::length() const return result; } -double Measurement::angle(const Base::Vector3d ¶m) const +double Measurement::angle(const Base::Vector3d & /*param*/) const { int numRefs = References3D.getSize(); if(!numRefs) diff --git a/src/Mod/Measure/App/MeasurementPyImp.cpp b/src/Mod/Measure/App/MeasurementPyImp.cpp index 9970f395f..e100f58e7 100644 --- a/src/Mod/Measure/App/MeasurementPyImp.cpp +++ b/src/Mod/Measure/App/MeasurementPyImp.cpp @@ -52,7 +52,7 @@ PyObject *MeasurementPy::PyMake(struct _typeobject *, PyObject *, PyObject *) / } // constructor method -int MeasurementPy::PyInit(PyObject* args, PyObject* /*kwd*/) +int MeasurementPy::PyInit(PyObject* /*args*/, PyObject* /*kwd*/) { return 0; } @@ -97,47 +97,64 @@ PyObject* MeasurementPy::has3DReferences(PyObject *args) return result; } -PyObject* MeasurementPy::clear(PyObject *) +PyObject* MeasurementPy::clear(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + this->getMeasurementPtr()->clear(); Py_Return; } -PyObject* MeasurementPy::delta(PyObject *) +PyObject* MeasurementPy::delta(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + Py::Vector delta(this->getMeasurementPtr()->delta()); return Py::new_reference_to(delta); } - -PyObject* MeasurementPy::length(PyObject *) +PyObject* MeasurementPy::length(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + Py::Float length; length = this->getMeasurementPtr()->length(); return Py::new_reference_to(length); } -PyObject* MeasurementPy::radius(PyObject *) +PyObject* MeasurementPy::radius(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + Py::Float radius; radius = this->getMeasurementPtr()->radius(); return Py::new_reference_to(radius); } -PyObject* MeasurementPy::angle(PyObject *) +PyObject* MeasurementPy::angle(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + Py::Float angle; angle = this->getMeasurementPtr()->angle(); return Py::new_reference_to(angle); } -PyObject* MeasurementPy::com(PyObject *) +PyObject* MeasurementPy::com(PyObject *args) { + if (!PyArg_ParseTuple(args, "")) + return 0; + Py::Vector com(this->getMeasurementPtr()->massCenter()); return Py::new_reference_to(com);