FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up observer_ptr<> and removed the eronous casting of ptr in objectDeleted.

Browse Source
This commit is contained in:
Robert Osfield 2010-02-19 19:50:55 +00:00
parent 657c5c4e71
commit eca4361c4a
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/osg/observer_ptr
View File

@ -38,9 +38,13 @@ class observer_ptr : public Observer
public:
typedef T element_type;
observer_ptr() :_ptr(0L) {}
observer_ptr(T* t):_ptr(t) { if (_ptr) _ptr->addObserver(this); }
observer_ptr(const observer_ptr& rp):Observer(), _ptr(rp._ptr) { if (_ptr) _ptr->addObserver(this); }
observer_ptr(): _ptr(0L) {}
observer_ptr(T* t): _ptr(t) { if (_ptr) _ptr->addObserver(this); }
observer_ptr(const observer_ptr& rp): _ptr(0L)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getObserverMutex());
if (_ptr) _ptr->addObserver(this);
}
~observer_ptr()
{
@ -79,7 +83,8 @@ class observer_ptr : public Observer
ref_ptr<T> lock() const
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getObserverMutex());
return ref_ptr<T>(_ptr);
if (_ptr && _ptr->referenceCount()>0) return ref_ptr<T>(_ptr);
else return ref_ptr<T>(_ptr);
}
// get the raw C pointer
@ -101,23 +106,21 @@ class observer_ptr : public Observer
// to make thread safe one should either ensure a high level that object will not be deleted
// which operating on it, or by using the observer_ptr<>::lock() to get a ref_ptr<> that ensures the
// objects stay alive throughout all access to it.
inline T& operator*() const { return *_ptr; }
inline T* operator->() const { return _ptr; }
inline T& operator*() const { return *_ptr; }
inline T* operator->() const { return _ptr; }
inline bool operator!() const { return _ptr==0L; }
inline bool valid() const { return _ptr!=0L; }
inline bool operator!() const { return _ptr==0L; }
inline bool valid() const { return _ptr!=0L; }
protected:
virtual void objectDeleted(void* obj)
virtual void objectDeleted(void*)
{
T* ref_obj = static_cast<T*>(obj);
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*getObserverMutex());
if (ref_obj->referenceCount() == 0) _ptr = 0;
_ptr = 0;
}
T* _ptr;
T* _ptr;
};
}