summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 14:45:28 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-11-10 15:36:29 -0200
commitf2a10c2257e40a7f24c457ad45d875f997a2cc5a (patch)
tree6cf77141648f78d52c6f50f950c4c487f849eaad
parent50fae8be6d673c56a10cd414e9f7da1a5151b062 (diff)
downloadshiboken-f2a10c2257e40a7f24c457ad45d875f997a2cc5a.tar.gz
shiboken-f2a10c2257e40a7f24c457ad45d875f997a2cc5a.tar.xz
shiboken-f2a10c2257e40a7f24c457ad45d875f997a2cc5a.zip
Removed macros SbkBaseWrapper_Check and SbkBaseWrapper_CheckExact.
-rw-r--r--generator/cppgenerator.cpp2
-rw-r--r--libshiboken/basewrapper.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index a5446037..e69ff3c7 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -1166,7 +1166,7 @@ void CppGenerator::writeMethodWrapper(QTextStream& s, const AbstractMetaFunction
s << INDENT << "if (!isReverse" << endl;
{
Indentation indent(INDENT);
- s << INDENT << "&& SbkBaseWrapper_Check(arg)" << endl;
+ s << INDENT << "&& Shiboken::isShibokenType(arg)" << endl;
s << INDENT << "&& !PyObject_TypeCheck(arg, self->ob_type)" << endl;
s << INDENT << "&& PyObject_HasAttrString(arg, const_cast<char*>(\"" << revOpName << "\"))) {" << endl;
// This PyObject_CallMethod call will emit lots of warnings like
diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h
index c6b936b7..40d7b22e 100644
--- a/libshiboken/basewrapper.h
+++ b/libshiboken/basewrapper.h
@@ -166,9 +166,6 @@ LIBSHIBOKEN_API bool canCallConstructor(PyTypeObject* myType, PyTypeObject* ctor
*/
#define Shiboken_TypeCheck(pyobj, type) (PyObject_TypeCheck(pyobj, SbkType<type>()))
-#define SbkBaseWrapper_Check(op) PyObject_TypeCheck(op, (PyTypeObject*)&SbkObject_Type)
-#define SbkBaseWrapper_CheckExact(op) ((op)->ob_type == &SbkObject_Type)
-
/**
* Increments the reference count of the referred Python object.
* A previous Python object in the same position identified by the 'key' parameter