From a3f317226d17c377653f5fb499bd045f943d3b4c Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 17 Feb 2011 14:40:50 +0000 Subject: [PATCH] Remove warnings --- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 22 +++++++++---------- src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx | 12 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 12d7146..1bd4d93 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -131,8 +131,8 @@ static PyMethodDef PyStdOut_methods[] = { }; static PyMemberDef PyStdOut_memberlist[] = { - {"softspace", T_INT, offsetof(PyStdOut, softspace), 0, - "flag indicating that a space needs to be printed; used by print"}, + {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0, + (char*)"flag indicating that a space needs to be printed; used by print"}, {NULL} /* Sentinel */ }; @@ -1673,15 +1673,15 @@ status_t size_on_surface(integer face_id, real *uv, real *size, void *user_data) assert(Py_IsInitialized()); PyGILState_STATE gstate; gstate = PyGILState_Ensure(); - pyresult = PyObject_CallFunction(FaceId2PythonSmp[face_id],"(f,f)",uv[0],uv[1]); + pyresult = PyObject_CallFunction(FaceId2PythonSmp[face_id],(char*)"(f,f)",uv[0],uv[1]); double result; if ( pyresult == NULL){ fflush(stderr); string err_description=""; new_stderr = newPyStdOut(err_description); - PySys_SetObject("stderr", new_stderr); + PySys_SetObject((char*)"stderr", new_stderr); PyErr_Print(); - PySys_SetObject("stderr", PySys_GetObject("__stderr__")); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); Py_DECREF(new_stderr); MESSAGE("Can't evaluate f(" << uv[0] << "," << uv[1] << ")" << " error is " << err_description); result = *((double*)user_data); @@ -1708,15 +1708,15 @@ status_t size_on_edge(integer edge_id, real t, real *size, void *user_data) assert(Py_IsInitialized()); PyGILState_STATE gstate; gstate = PyGILState_Ensure(); - pyresult = PyObject_CallFunction(EdgeId2PythonSmp[edge_id],"(f)",t); + pyresult = PyObject_CallFunction(EdgeId2PythonSmp[edge_id],(char*)"(f)",t); double result; if ( pyresult == NULL){ fflush(stderr); string err_description=""; new_stderr = newPyStdOut(err_description); - PySys_SetObject("stderr", new_stderr); + PySys_SetObject((char*)"stderr", new_stderr); PyErr_Print(); - PySys_SetObject("stderr", PySys_GetObject("__stderr__")); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); Py_DECREF(new_stderr); MESSAGE("Can't evaluate f(" << t << ")" << " error is " << err_description); result = *((double*)user_data); @@ -1742,15 +1742,15 @@ status_t size_on_vertex(integer point_id, real *size, void *user_data) assert(Py_IsInitialized()); PyGILState_STATE gstate; gstate = PyGILState_Ensure(); - pyresult = PyObject_CallFunction(VertexId2PythonSmp[point_id],""); + pyresult = PyObject_CallFunction(VertexId2PythonSmp[point_id],(char*)""); double result; if ( pyresult == NULL){ fflush(stderr); string err_description=""; new_stderr = newPyStdOut(err_description); - PySys_SetObject("stderr", new_stderr); + PySys_SetObject((char*)"stderr", new_stderr); PyErr_Print(); - PySys_SetObject("stderr", PySys_GetObject("__stderr__")); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); Py_DECREF(new_stderr); MESSAGE("Can't evaluate f()" << " error is " << err_description); result = *((double*)user_data); diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx index 33569f0..2cdf62d 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx @@ -183,8 +183,8 @@ static PyMethodDef PyStdOut_methods[] = { }; static PyMemberDef PyStdOut_memberlist[] = { - {"softspace", T_INT, offsetof(PyStdOut, softspace), 0, - "flag indicating that a space needs to be printed; used by print"}, + {(char*)"softspace", T_INT, offsetof(PyStdOut, softspace), 0, + (char*)"flag indicating that a space needs to be printed; used by print"}, {NULL} /* Sentinel */ }; @@ -2105,9 +2105,9 @@ bool BLSURFPluginGUI_HypothesisCreator::sizeMapValidationFromEntry(QString myEnt fflush(stderr); err_description=""; new_stderr=newPyStdOut(err_description); - PySys_SetObject("stderr", new_stderr); + PySys_SetObject((char*)"stderr", new_stderr); PyErr_Print(); - PySys_SetObject("stderr", PySys_GetObject("__stderr__")); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); Py_DECREF(new_stderr); if (displayError) SUIT_MessageBox::warning( dlg(),"Definition of Python Function : Error" ,err_description.c_str() ); @@ -2122,9 +2122,9 @@ bool BLSURFPluginGUI_HypothesisCreator::sizeMapValidationFromEntry(QString myEnt fflush(stderr); err_description=""; new_stderr=newPyStdOut(err_description); - PySys_SetObject("stderr", new_stderr); + PySys_SetObject((char*)"stderr", new_stderr); PyErr_Print(); - PySys_SetObject("stderr", PySys_GetObject("__stderr__")); + PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); Py_DECREF(new_stderr); if (displayError) SUIT_MessageBox::warning( dlg(),"Python Error" ,err_description.c_str() ); -- 2.39.2