diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-10 14:19:44 -0200 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:08:57 -0300 |
| commit | 8c7e60cc6bb07bd58a555d782bcac984f42866bf (patch) | |
| tree | a153d51652e1b9322b69d01c115c7699900043d7 /libshiboken/basewrapper.h | |
| parent | 4d0bbcf41feb5a1e2a1e7adc52f40ad0f187d6ea (diff) | |
SbkBaseWrapperType renamed to SbkObjectType.
Diffstat (limited to 'libshiboken/basewrapper.h')
| -rw-r--r-- | libshiboken/basewrapper.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libshiboken/basewrapper.h b/libshiboken/basewrapper.h index df5f8e352..fbb558f7e 100644 --- a/libshiboken/basewrapper.h +++ b/libshiboken/basewrapper.h @@ -51,7 +51,7 @@ struct LIBSHIBOKEN_API SbkObject LIBSHIBOKEN_API void SbkDeallocWrapper(PyObject* pyObj); LIBSHIBOKEN_API void SbkDeallocWrapperWithPrivateDtor(PyObject* self); -struct SbkBaseWrapperType; +struct SbkObjectType; /// Function signature for the multiple inheritance information initializers that should be provided by classes with multiple inheritance. typedef int* (*MultipleInheritanceInitFunction)(const void*); @@ -61,9 +61,9 @@ typedef int* (*MultipleInheritanceInitFunction)(const void*); * part of a multiple inheritance hierarchy. * The implementation of this function is auto generated by the generator and you don't need to care about it. */ -typedef void* (*SpecialCastFunction)(void*, SbkBaseWrapperType*); +typedef void* (*SpecialCastFunction)(void*, SbkObjectType*); typedef void* (*ObjectCopierFunction)(const void*); -typedef SbkBaseWrapperType* (*TypeDiscoveryFunc)(void*, SbkBaseWrapperType*); +typedef SbkObjectType* (*TypeDiscoveryFunc)(void*, SbkObjectType*); typedef void* (*ExtendedToCppFunc)(PyObject*); typedef bool (*ExtendedIsConvertibleFunc)(PyObject*); @@ -72,10 +72,10 @@ typedef bool (*ExtendedIsConvertibleFunc)(PyObject*); typedef void (*DeleteUserDataFunc)(void*); extern LIBSHIBOKEN_API PyTypeObject SbkBaseWrapperType_Type; -extern LIBSHIBOKEN_API SbkBaseWrapperType SbkBaseWrapper_Type; +extern LIBSHIBOKEN_API SbkObjectType SbkBaseWrapper_Type; /// PyTypeObject extended with C++ multiple inheritance information. -struct LIBSHIBOKEN_API SbkBaseWrapperType +struct LIBSHIBOKEN_API SbkObjectType { PyHeapTypeObject super; int* mi_offsets; @@ -146,7 +146,7 @@ inline bool isShibokenType(PyObject*& pyObj) */ inline bool isUserType(PyObject*& pyObj) { - return isShibokenType(pyObj) && reinterpret_cast<SbkBaseWrapperType*>(pyObj->ob_type)->is_user_type; + return isShibokenType(pyObj) && reinterpret_cast<SbkObjectType*>(pyObj->ob_type)->is_user_type; } /** @@ -195,7 +195,7 @@ LIBSHIBOKEN_API void setErrorAboutWrongArguments(PyObject* args, const char* fun namespace Wrapper { -LIBSHIBOKEN_API PyObject* newObject(SbkBaseWrapperType* instanceType, +LIBSHIBOKEN_API PyObject* newObject(SbkObjectType* instanceType, void* cptr, bool hasOwnership = true, bool isExactType = false, |