Wrapper invalidation method recursively updates children objects status.

BindingManager::invalidateWrapper checks if the object to be invalidated
carries any children objects and recursively invalidates them.

Shiboken::destroyParentInfo function was refactored to call the new
recursive wrapper invalidator and then call a helper function that
only destroy the parent information.

The invalidate parent test was updated.

1 files changed, 9 insertions, 2 deletions

diff --git a/libshiboken/bindingmanager.h b/libshiboken/bindingmanager.h
index 8785b681a..fe5767d32 100644
--- a/libshiboken/bindingmanager.h
+++ b/libshiboken/bindingmanager.h
@@ -41,6 +41,8 @@
 namespace Shiboken
 {
 
+struct PyBaseWrapper;
+
 class LIBSHIBOKEN_API BindingManager
 {
 public:
@@ -52,8 +54,13 @@ public:
     PyObject* retrieveWrapper(const void* cptr);
     PyObject* getOverride(const void* cptr, const char* methodName);
 
-    /// Invalidate the Python wrapper and removes the relations from C++ objects the Python wrapper.
-    void invalidateWrapper(PyObject* wrapper);
+    /// Invalidate the Python wrapper and removes the relations from C++ pointers to the Python wrapper.
+    void invalidateWrapper(PyBaseWrapper* wrapper);
+    /// Convenience method to call invalidateWrapper with a properly cast PyBaseWrapper.
+    inline void invalidateWrapper(PyObject* wrapper)
+    {
+        invalidateWrapper(reinterpret_cast<PyBaseWrapper*>(wrapper));
+    }
     /// Convenience method to invalidate the Python wrapper for a C++ wrapped object. Do nothing if C++ pointer has no Python wrapper.
     void invalidateWrapper(const void* cptr);