diff options
Diffstat (limited to 'Lib/python/pytypemaps.swg')
| -rw-r--r-- | Lib/python/pytypemaps.swg | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/Lib/python/pytypemaps.swg b/Lib/python/pytypemaps.swg index 90e4f9633..08d52b9ae 100644 --- a/Lib/python/pytypemaps.swg +++ b/Lib/python/pytypemaps.swg @@ -16,37 +16,30 @@ * Basic definitions * ----------------------------------------------------------------------------- */ -%define_swig_object(PyObject *) +#define SWIG_Object PyObject * +#define VOID_Object (Py_INCREF(Py_None) ? Py_None : 0) -#define SWIG_VoidObject() (Py_INCREF(Py_None) ? Py_None : 0) -#define SWIG_SetResultObj(obj) $result = obj -#define SWIG_AppendResultObj(obj) $result = SWIG_Python_AppendResult($result, obj) -#define SWIG_SetConstantObj(name, obj) SWIG_block(PyObject *_obj = obj; PyDict_SetItemString(d, name, _obj); Py_DECREF(_obj)) -#define SWIG_Raise(obj, type, desc) PyObject *_obj = obj; PyErr_SetObject(SWIG_Python_ExceptionType(desc), _obj); Py_DECREF(_obj) -#define SWIG_DirOutFail(code, msg) Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(code), msg) +#define SWIG_AppendOutput(result,obj) SWIG_Python_AppendOutput(result, obj) +#define SWIG_SetConstant(name, obj) %block(PyObject *_obj = obj; PyDict_SetItemString(d, name, _obj); Py_DECREF(_obj)) +#define SWIG_Raise(obj, type, desc) PyObject *_obj = obj; PyErr_SetObject(SWIG_Python_ExceptionType(desc), _obj); Py_DECREF(_obj) +#define SWIG_DirOutFail(code, msg) Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(code), msg) /* ----------------------------------------------------------------------------- * All the typemaps * ----------------------------------------------------------------------------- */ -%include <typemaps/exception.swg> -%include <pyswigtype.swg> -%include <typemaps/void.swg> -%include <typemaps/valtypes.swg> -%include <typemaps/ptrtypes.swg> -%include <typemaps/swigobject.swg> -%include <typemaps/inoutlist.swg> %include <pyprimtypes.swg> %include <pystrings.swg> -%include <typemaps/misctypes.swg> -%include <typemaps/enumint.swg> +%include <typemaps/swigtypemaps.swg> +/* fix for callbacks */ +%include <pyswigtype.swg> /* ----------------------------------------------------------------------------- * Backward compatibility output helper * ----------------------------------------------------------------------------- */ %fragment("t_output_helper","header") %{ -#define t_output_helper SWIG_Python_AppendResult +#define t_output_helper SWIG_Python_AppendOutput %} |