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

Changed parameter name from osberver_ptr to observer.

Browse Source
This commit is contained in:
Robert Osfield
2006-07-04 19:58:53 +00:00
parent 6c6c131452
commit ce4b3a7b9e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Referenced
View File

@@ -80,10 +80,10 @@ class OSG_EXPORT Referenced
inline int referenceCount() const { return _refCount; }
/** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/
void addObserver(Observer* observer_ptr);
void addObserver(Observer* observer);
/** Add a Observer that is observering this object, notify the Observer when this object gets deleted.*/
void removeObserver(Observer* observer_ptr);
void removeObserver(Observer* observer);
public:
@@ -189,8 +189,8 @@ class OSG_EXPORT Referenced : public NoodleGlue::CBridgable
inline int referenceCount() const { return _refCount; }
/* These methods are not used in JavaOSG */
void addObserver(Observer* observer_ptr) {}
void removeObserver(Observer* observer_ptr) {}
void addObserver(Observer* observer) {}
void removeObserver(Observer* observer) {}
public:

12
src/osg/Referenced.cpp
View File

@@ -227,33 +227,33 @@ void Referenced::unref_nodelete() const
}
}
void Referenced::addObserver(Observer* observer_ptr)
void Referenced::addObserver(Observer* observer)
{
if (_refMutex)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*_refMutex);
if (!_observers) _observers = new ObserverSet;
if (_observers) static_cast<ObserverSet*>(_observers)->insert(observer_ptr);
if (_observers) static_cast<ObserverSet*>(_observers)->insert(observer);
}
else
{
if (!_observers) _observers = new ObserverSet;
if (_observers) static_cast<ObserverSet*>(_observers)->insert(observer_ptr);
if (_observers) static_cast<ObserverSet*>(_observers)->insert(observer);
}
}
void Referenced::removeObserver(Observer* observer_ptr)
void Referenced::removeObserver(Observer* observer)
{
if (_refMutex)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*_refMutex);
if (_observers) static_cast<ObserverSet*>(_observers)->erase(observer_ptr);
if (_observers) static_cast<ObserverSet*>(_observers)->erase(observer);
}
else
{
if (_observers) static_cast<ObserverSet*>(_observers)->erase(observer_ptr);
if (_observers) static_cast<ObserverSet*>(_observers)->erase(observer);
}
}