From 4ab9c6f5f4e85e24c6c457b469d8e50d60db8d46 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 26 Nov 2006 22:27:09 +0000
Subject: [PATCH] Removed check from objectDeleted(void*) method as this was
 not catching cases where the registered ptr was different from the deleted
 ptr - something that can happen with multiple inheritance.

---
 include/osg/observer_ptr | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/osg/observer_ptr b/include/osg/observer_ptr
index b19a4694a..6a07ad834 100644
--- a/include/osg/observer_ptr
+++ b/include/osg/observer_ptr
@@ -14,6 +14,8 @@
 #ifndef OSG_OBSERVER_PTR
 #define OSG_OBSERVER_PTR
 
+#include <osg/Notify>
+
 namespace osg {
 
 class Observer
@@ -57,12 +59,9 @@ class observer_ptr : public Observer
             return *this;
         }
         
-        virtual void objectDeleted(void* ptr)
+        virtual void objectDeleted(void*)
         {
-            if (_ptr==ptr)
-            {
-                _ptr = 0;
-            }
+            _ptr = 0;
         }
 
         // comparison operators for observer_ptr.