diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 14:45:28 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:57 -0300 |
| commit | 899f9c2ccfc6967867f6d5f1cad925011a2f756b (patch) | |
| tree | 237fde59e4e04a4b3ec875b98ba1a7721ac71720 | |
| parent | cdeb0172eca90f2050313b589fb068145d882dbb (diff) | |
Removed macros SbkBaseWrapper_Check and SbkBaseWrapper_CheckExact.
| -rw-r--r-- | generator/cppgenerator.cpp | 2 | ||||
| -rw-r--r-- | libshiboken/basewrapper.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp index a5446037c..e69ff3c71 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 c6b936b75..40d7b22e4 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 |