From ab6a868057eecb9d68c66820ccc9e8d8e05e4e9a Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 28 Mar 2017 16:31:42 +0100 Subject: [PATCH] Don't rely on TypeName just for error messages calling python callbacks --- qrenderdoc/Code/pyrenderdoc/pyconversion.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Code/pyrenderdoc/pyconversion.h b/qrenderdoc/Code/pyrenderdoc/pyconversion.h index 4ec014d08..dcf95b27e 100644 --- a/qrenderdoc/Code/pyrenderdoc/pyconversion.h +++ b/qrenderdoc/Code/pyrenderdoc/pyconversion.h @@ -436,7 +436,7 @@ PyObject *Convert(const T &in) } template -T get_return(const char *funcname, PyObject *result, bool &failflag) +inline T get_return(const char *funcname, PyObject *result, bool &failflag) { T val = T(); @@ -456,7 +456,7 @@ T get_return(const char *funcname, PyObject *result, bool &failflag) } template <> -void get_return(const char *funcname, PyObject *result, bool &failflag) +inline void get_return(const char *funcname, PyObject *result, bool &failflag) { Py_XDECREF(result); } @@ -487,8 +487,8 @@ struct varfunc Py_DecRef(args); args = NULL; - PyErr_Format(PyExc_TypeError, "Expected a '%s' for arg %d of callback in %s", - TypeName::type>(), currentarg + 1, funcname); + PyErr_Format(PyExc_TypeError, "Unexpected type for arg %d of callback in %s", currentarg + 1, + funcname); return; }