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.
This commit is contained in:
Robert Osfield 2006-11-26 22:27:09 +00:00
parent 426fd9eaf7
commit 4ab9c6f5f4

View File

@ -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.