Boost 1.31.0

[lyx.git] / boost / boost / scoped_ptr.hpp

diff --git a/boost/boost/scoped_ptr.hpp b/boost/boost/scoped_ptr.hpp
index 429d295c04a1c93b9d52ebe47fa9727f2a245d8d..c36cacead33a823840ed5f2a1506a8eefc37f6b4 100644 (file)
--- a/boost/boost/scoped_ptr.hpp
+++ b/boost/boost/scoped_ptr.hpp
@@ -110,15 +110,22 @@ public:
         return ptr != 0;
     }
 
-#else
-
+#elif defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
     typedef T * (this_type::*unspecified_bool_type)() const;
-
+    
     operator unspecified_bool_type() const // never throws
     {
         return ptr == 0? 0: &this_type::get;
     }
 
+#else 
+    typedef T * this_type::*unspecified_bool_type;
+
+    operator unspecified_bool_type() const // never throws
+    {
+        return ptr == 0? 0: &this_type::ptr;
+    }
+
 #endif
 
     bool operator! () const // never throws