From 11188b025c6d619e7226c28ee5be002175d91291 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 19 Nov 2003 17:32:06 +0000 Subject: [PATCH] SWIG Runtime update git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/common.swg | 5 +++-- wxPython/src/libpy.c | 10 +--------- wxPython/src/pyrun.swg | 9 +-------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/wxPython/src/common.swg b/wxPython/src/common.swg index b846cd4842..07da2cff3c 100644 --- a/wxPython/src/common.swg +++ b/wxPython/src/common.swg @@ -48,10 +48,10 @@ typedef void *(*swig_converter_func)(void *); typedef struct swig_type_info *(*swig_dycast_func)(void **); typedef struct swig_type_info { - const char *name; + const char *name; swig_converter_func converter; const char *str; - void *clientdata; + void *clientdata; swig_dycast_func dcast; struct swig_type_info *next; struct swig_type_info *prev; @@ -69,4 +69,5 @@ SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *); #ifdef __cplusplus } + #endif diff --git a/wxPython/src/libpy.c b/wxPython/src/libpy.c index bb1b4608c5..f83e6cb764 100644 --- a/wxPython/src/libpy.c +++ b/wxPython/src/libpy.c @@ -666,15 +666,7 @@ SWIG_Python_InstallConstants(PyObject *d, swig_const_info constants[]) { /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else #ifdef __cplusplus } diff --git a/wxPython/src/pyrun.swg b/wxPython/src/pyrun.swg index b9852fe40c..a59d99272c 100644 --- a/wxPython/src/pyrun.swg +++ b/wxPython/src/pyrun.swg @@ -81,15 +81,8 @@ SWIGEXPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con /* Contract support */ -#define SWIG_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else +#define SWIG_contract_assert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, (char *) msg ); goto fail; } else -#define SWIG_inherit_preassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_inherit_postassert(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else - -#define SWIG_invariant(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_begin(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else -#define SWIG_invariant_end(expr, msg) if (!(expr)) { PyErr_SetString(PyExc_RuntimeError, msg #expr ); goto fail; } else #ifdef __cplusplus } -- 2.47.2