jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Python] Fix some warnings when compiling generated wrappers with

Browse source 
certain GCC warning options (Debian bug #650246).


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12852 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2011-11-29 05:31:37 +00:00
commit 83cc1f6a3e
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 2.0.5 (in progress) Version 2.0.5 (in progress)
=========================== ===========================
2011-11-27: olly
[Python] Fix some warnings when compiling generated wrappers with
certain GCC warning options (Debian bug #650246).
2011-11-28: wsfulton 2011-11-28: wsfulton
Fix #3433541 %typemap(in, numinputs=0) with 10+ arguments. Fix #3433541 %typemap(in, numinputs=0) with 10+ arguments.

18
Lib/python/pyrun.swg
View file

@ -71,7 +71,7 @@ SWIG_Python_SetErrorObj(PyObject *errtype, PyObject *obj) {
SWIGINTERN void SWIGINTERN void
SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) { SWIG_Python_SetErrorMsg(PyObject *errtype, const char *msg) {
SWIG_PYTHON_THREAD_BEGIN_BLOCK; SWIG_PYTHON_THREAD_BEGIN_BLOCK;
PyErr_SetString(errtype, (char *) msg); PyErr_SetString(errtype, msg);
SWIG_PYTHON_THREAD_END_BLOCK; SWIG_PYTHON_THREAD_END_BLOCK;
} }
@ -90,7 +90,11 @@ SwigPyBuiltin_AddPublicSymbol(PyObject *seq, const char *key) {
SWIGINTERN void SWIGINTERN void
SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) { SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *name, PyObject *obj) {
#if PY_VERSION_HEX < 0x02030000
PyDict_SetItemString(d, (char *)name, obj); PyDict_SetItemString(d, (char *)name, obj);
#else
PyDict_SetItemString(d, name, obj);
#endif
Py_DECREF(obj); Py_DECREF(obj);
if (public_interface) if (public_interface)
SwigPyBuiltin_AddPublicSymbol(public_interface, name); SwigPyBuiltin_AddPublicSymbol(public_interface, name);
@ -100,7 +104,11 @@ SWIG_Python_SetConstant(PyObject *d, PyObject *public_interface, const char *nam
SWIGINTERN void SWIGINTERN void
SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) { SWIG_Python_SetConstant(PyObject *d, const char *name, PyObject *obj) {
#if PY_VERSION_HEX < 0x02030000
PyDict_SetItemString(d, (char *)name, obj); PyDict_SetItemString(d, (char *)name, obj);
#else
PyDict_SetItemString(d, name, obj);
#endif
Py_DECREF(obj); Py_DECREF(obj);
} }
@ -625,8 +633,10 @@ SwigPyObject_own(PyObject *v, PyObject *args)
PyObject *val = 0; PyObject *val = 0;
#if (PY_VERSION_HEX < 0x02020000) #if (PY_VERSION_HEX < 0x02020000)
if (!PyArg_ParseTuple(args,(char *)"|O:own",&val)) if (!PyArg_ParseTuple(args,(char *)"|O:own",&val))
#else #elif (PY_VERSION_HEX < 0x02050000)
if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val)) if (!PyArg_UnpackTuple(args, (char *)"own", 0, 1, &val))
#else
if (!PyArg_UnpackTuple(args, "own", 0, 1, &val))
#endif #endif
{ {
return NULL; return NULL;
@ -1388,7 +1398,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this)
SWIGINTERN PyObject * SWIGINTERN PyObject *
SWIG_Python_InitShadowInstance(PyObject *args) { SWIG_Python_InitShadowInstance(PyObject *args) {
PyObject *obj[2]; PyObject *obj[2];
if (!SWIG_Python_UnpackTuple(args,(char*)"swiginit", 2, 2, obj)) { if (!SWIG_Python_UnpackTuple(args, "swiginit", 2, 2, obj)) {
return NULL; return NULL;
} else { } else {
SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]); SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]);
@ -1664,7 +1674,7 @@ SwigPyObject_GetDesc(PyObject *self)
{ {
SwigPyObject *v = (SwigPyObject *)self; SwigPyObject *v = (SwigPyObject *)self;
swig_type_info *ty = v ? v->ty : 0; swig_type_info *ty = v ? v->ty : 0;
return ty ? ty->str : (char*)""; return ty ? ty->str : "";
} }
SWIGRUNTIME void SWIGRUNTIME void