compilation fixes for standard-conformant compilers and added back implicit conversio...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/weakref.h b/include/wx/weakref.h
index 99621fca4997b1b9764b3cdd438812d8e5e01bd5..4af0b2525a17216f2288014434ef02a8d976c431 100644 (file)
--- a/include/wx/weakref.h
+++ b/include/wx/weakref.h
@@ -207,21 +207,14 @@ public:
         return *this;
     }
 
         return *this;
     }
 

-    virtual ~wxWeakRef() { Release(); }
+    virtual ~wxWeakRef() { this->Release(); }

 
     // Smart pointer functions
 
     // Smart pointer functions

-    T& operator*() const { return *m_pobj; }
-    T* operator->() const { return m_pobj; }
+    T& operator*() const { return *this->m_pobj; }
+    T* operator->() const { return this->m_pobj; }

 
 

-    T* get() const { return m_pobj; }
-
-    // test for pointer validity: defining conversion to unspecified_bool_type
-    // and not more obvious bool to avoid implicit conversions to integer types
-    typedef T *(wxWeakRef<T>::*unspecified_bool_type)() const;
-    operator unspecified_bool_type() const
-    {
-        return this->m_pobj ? &wxWeakRef<T>::get : NULL;
-    }
+    T* get() const { return this->m_pobj; }
+    operator T*() const { return get(); }

 };
 
 
 };