diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-10-20 13:53:47 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2011-10-20 13:53:47 -0200 |
commit | 70e8fa58a898fe65147c73cd6567cf355a4519cf (patch) | |
tree | 74e63dc237f2b9aca8997f08062645f5f8ad79e2 | |
parent | 64850d948227ea54848ae0c46ffdd1a9bcf0cb9a (diff) | |
download | shiboken-70e8fa58a898fe65147c73cd6567cf355a4519cf.tar.gz shiboken-70e8fa58a898fe65147c73cd6567cf355a4519cf.tar.xz shiboken-70e8fa58a898fe65147c73cd6567cf355a4519cf.zip |
Fix ABI break and link error on MS Windows.1.0.8
-rw-r--r-- | libshiboken/bindingmanager.cpp | 6 | ||||
-rw-r--r-- | libshiboken/bindingmanager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libshiboken/bindingmanager.cpp b/libshiboken/bindingmanager.cpp index 26a3e189..4f40bac2 100644 --- a/libshiboken/bindingmanager.cpp +++ b/libshiboken/bindingmanager.cpp @@ -287,13 +287,13 @@ SbkObjectType* BindingManager::resolveType(void** cptr, SbkObjectType* type) return identifiedType ? identifiedType : type; } -std::set<SbkObject*> BindingManager::getAllPyObjects() +std::set<PyObject*> BindingManager::getAllPyObjects() { - std::set<SbkObject*> pyObjects; + std::set<PyObject*> pyObjects; const WrapperMap& wrappersMap = m_d->wrapperMapper; WrapperMap::const_iterator it = wrappersMap.begin(); for (; it != wrappersMap.end(); ++it) - pyObjects.insert(it->second); + pyObjects.insert(reinterpret_cast<PyObject*>(it->second)); return pyObjects; } diff --git a/libshiboken/bindingmanager.h b/libshiboken/bindingmanager.h index 8f8c301c..ca4bd8fd 100644 --- a/libshiboken/bindingmanager.h +++ b/libshiboken/bindingmanager.h @@ -64,7 +64,7 @@ public: */ SbkObjectType* resolveType(void** cptr, SbkObjectType* type); - std::set<SbkObject*> getAllPyObjects(); + std::set<PyObject*> getAllPyObjects(); /** * Calls the function \p visitor for each object registered on binding manager. |