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

Fix to make ISOC89 compliant: -Werror=declaration-after-statement

Browse source
This commit is contained in:
William S Fulton 2018-08-10 12:44:23 +01:00
commit 91e9743014
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/python/pyerrors.swg
View file

@ -87,12 +87,13 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message)
{ {
if (SWIG_Python_TypeErrorOccurred(NULL)) { if (SWIG_Python_TypeErrorOccurred(NULL)) {
/* Use existing TypeError to preserve stacktrace and enhance with given message */ /* Use existing TypeError to preserve stacktrace and enhance with given message */
PyObject *newvalue;
PyObject *type = NULL, *value = NULL, *traceback = NULL; PyObject *type = NULL, *value = NULL, *traceback = NULL;
PyErr_Fetch(&type, &value, &traceback); PyErr_Fetch(&type, &value, &traceback);
#if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03000000
PyObject *newvalue = PyUnicode_FromFormat("%S\nAdditional Information:\n%s", value, message); newvalue = PyUnicode_FromFormat("%S\nAdditional Information:\n%s", value, message);
#else #else
PyObject *newvalue = PyString_FromFormat("%s\nAdditional Information:\n%s", PyString_AsString(value), message); newvalue = PyString_FromFormat("%s\nAdditional Information:\n%s", PyString_AsString(value), message);
#endif #endif
Py_XDECREF(value); Py_XDECREF(value);
PyErr_Restore(type, newvalue, traceback); PyErr_Restore(type, newvalue, traceback);

4
Source/Modules/python.cxx
View file

@ -2586,6 +2586,10 @@ public:
dispatch = Swig_overload_dispatch_cast(n, dispatch_code, &maxargs); dispatch = Swig_overload_dispatch_cast(n, dispatch_code, &maxargs);
} else { } else {
String *fastdispatch_code = NewStringf("PyObject *retobj = %s\nif (!SWIG_Python_TypeErrorOccurred(retobj)) return retobj;\nSWIG_fail;", dispatch_call); String *fastdispatch_code = NewStringf("PyObject *retobj = %s\nif (!SWIG_Python_TypeErrorOccurred(retobj)) return retobj;\nSWIG_fail;", dispatch_call);
if (!CPlusPlus) {
Insert(fastdispatch_code, 0, "{\n");
Append(fastdispatch_code, "\n}");
}
dispatch = Swig_overload_dispatch(n, dispatch_code, &maxargs, fastdispatch_code); dispatch = Swig_overload_dispatch(n, dispatch_code, &maxargs, fastdispatch_code);
Delete(fastdispatch_code); Delete(fastdispatch_code);
} }