Fix ABI break and link error on MS Windows.

pcacjr · Oct 20, 2011 · 70e8fa5 · 70e8fa5
1 parent 64850d9
commit 70e8fa5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -64,7 +64,7 @@ class LIBSHIBOKEN_API BindingManager
      */
     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.