From 0d9aaa5ca6caf162a2f79a9ee5662437b8ea53b5 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 6 Mar 2003 13:45:20 +0000
Subject: [PATCH] Reverted the ref_ptr<> implementation to prior implicit cast
 operator via commenting out// #define AUTOMATIC_CAST_TO_POINTER.

---
 include/osg/ref_ptr | 52 +++++++++++----------------------------------
 1 file changed, 12 insertions(+), 40 deletions(-)

diff --git a/include/osg/ref_ptr b/include/osg/ref_ptr
index 3d8512cb9..a0decab29 100644
--- a/include/osg/ref_ptr
+++ b/include/osg/ref_ptr
@@ -14,7 +14,7 @@
 #ifndef OSG_REF_PTR
 #define OSG_REF_PTR 1
 
-#define AUTOMATIC_CAST_TO_POINTER
+// #define AUTOMATIC_CAST_TO_POINTER
 
 namespace osg {
 
@@ -56,47 +56,19 @@ class ref_ptr
         }
 
 #ifndef AUTOMATIC_CAST_TO_POINTER
-        inline bool operator == (const ref_ptr& rp) const
-        {
-            return (_ptr==rp._ptr);
-        }
-
-        inline bool operator != (const ref_ptr& rp) const
-        {
-            return (_ptr!=rp._ptr);
-        }
-
-        inline bool operator < (const ref_ptr& rp) const
-        {
-            return (_ptr<rp._ptr);
-        }
-
-        inline bool operator > (const ref_ptr& rp) const
-        {
-            return (_ptr>rp._ptr);
-        }
-
-        inline bool operator == (const T* ptr) const
-        {
-            return (_ptr==ptr);
-        }
-
-        inline bool operator != (const T* ptr) const
-        {
-            return (_ptr!=ptr);
-        }
-        
-        inline bool operator < (const T* ptr) const
-        {
-            return (_ptr<ptr);
-        }
-        
-        inline bool operator > (const T* ptr) const
-        {
-            return (_ptr>ptr);
-        }
+        // comparison operators for ref_ptr.
+        inline bool operator == (const ref_ptr& rp) const { return (_ptr==rp._ptr); }
+        inline bool operator != (const ref_ptr& rp) const { return (_ptr!=rp._ptr); }
+        inline bool operator < (const ref_ptr& rp) const { return (_ptr<rp._ptr); }
+        inline bool operator > (const ref_ptr& rp) const { return (_ptr>rp._ptr); }
 #endif
 
+        // comparion operator for const T*.
+        inline bool operator == (const T* ptr) const { return (_ptr==ptr); }
+        inline bool operator != (const T* ptr) const { return (_ptr!=ptr); }
+        inline bool operator < (const T* ptr) const { return (_ptr<ptr); }
+        inline bool operator > (const T* ptr) const { return (_ptr>ptr); }
+
 
         inline T& operator*()  { return *_ptr; }