From ce4b3a7b9e770086b9ca0bb91c6066d14fe31e74 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 4 Jul 2006 19:58:53 +0000
Subject: [PATCH] Changed parameter name from osberver_ptr to observer.

---
 include/osg/Referenced |  8 ++++----
 src/osg/Referenced.cpp | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/osg/Referenced b/include/osg/Referenced
index a98a21818..05bc0f99d 100644
--- a/include/osg/Referenced
+++ b/include/osg/Referenced
@@ -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:
 
diff --git a/src/osg/Referenced.cpp b/src/osg/Referenced.cpp
index 0a1ca2efe..0574105e3 100644
--- a/src/osg/Referenced.cpp
+++ b/src/osg/Referenced.cpp
@@ -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);
     }
 }