Boost 1.31.0

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

diff --git a/boost/boost/scoped_array.hpp b/boost/boost/scoped_array.hpp
index abd75ad7963b764713b3c5404064a16721e50e8c..e5919a48eef711b8db7fcf89c4f7946cf4b792ad 100644 (file)
--- a/boost/boost/scoped_array.hpp
+++ b/boost/boost/scoped_array.hpp
@@ -15,6 +15,9 @@
 #include <boost/assert.hpp>
 #include <boost/checked_delete.hpp>
 #include <boost/config.hpp>   // in case ptrdiff_t not in std
+
+#include <boost/detail/workaround.hpp>
+
 #include <cstddef>            // for std::ptrdiff_t
 
 namespace boost
@@ -83,13 +86,32 @@ public:
 
     // implicit conversion to "bool"
 
-    typedef T * (this_type::*unspecified_bool_type)() const;
+#if defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x530)
+
+    operator bool () const
+    {
+        return ptr != 0;
+    }
 
+#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
     {
         return ptr == 0;