summaryrefslogtreecommitdiffstats
path: root/libshiboken/conversions.h
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 15:30:08 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 15:36:29 -0200
commit5c813360b2f647753bfbacaf705504b7710d613c (patch)
treeb1adb090b1e7ad58010dbba801c5fe9166f051e2 /libshiboken/conversions.h
parentf2a10c2257e40a7f24c457ad45d875f997a2cc5a (diff)
downloadshiboken-5c813360b2f647753bfbacaf705504b7710d613c.tar.gz
shiboken-5c813360b2f647753bfbacaf705504b7710d613c.tar.xz
shiboken-5c813360b2f647753bfbacaf705504b7710d613c.zip
Remove macro Shiboken_TypeCheck
Diffstat (limited to 'libshiboken/conversions.h')
-rw-r--r--libshiboken/conversions.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/libshiboken/conversions.h b/libshiboken/conversions.h
index dff14478..c52e1e4a 100644
--- a/libshiboken/conversions.h
+++ b/libshiboken/conversions.h
@@ -149,12 +149,10 @@ struct Converter<T*>
static T* toCpp(PyObject* pyobj)
{
- if (Shiboken_TypeCheck(pyobj, T))
+ if (PyObject_TypeCheck(pyobj, SbkType<T>()))
return (T*) Wrapper::cppPointer(pyobj, SbkType<T>());
-
else if (Converter<T>::isConvertible(pyobj))
return CppObjectCopier<T>::copy(Converter<T>::toCpp(pyobj));
-
else if (pyobj == Py_None)
return 0;