[Boost-commit] svn:boost r40914 - trunk/boost

From: pdimov_at_[hidden]
Date: 2007-11-07 17:47:56

Author: pdimov
Date: 2007-11-07 17:47:55 EST (Wed, 07 Nov 2007)
New Revision: 40914
URL: http://svn.boost.org/trac/boost/changeset/40914

Log:
Attempt unspecified bool fix for Sun 5.7-5.9
Text files modified: 
   trunk/boost/shared_ptr.hpp |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 deletions(-)

Modified: trunk/boost/shared_ptr.hpp
==============================================================================
--- trunk/boost/shared_ptr.hpp	(original)
+++ trunk/boost/shared_ptr.hpp	2007-11-07 17:47:55 EST (Wed, 07 Nov 2007)
@@ -383,7 +383,7 @@
 
     // implicit conversion to "bool"
 
-#if ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x580) ) || defined(__CINT__)
+#if ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, < 0x570) ) || defined(__CINT__)
 
     operator bool () const
     {
@@ -405,7 +405,8 @@
 
 #elif \
     ( defined(__MWERKS__) && BOOST_WORKAROUND(__MWERKS__, < 0x3200) ) || \
-    ( defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 304) )
+    ( defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 304) ) || \
+    ( defined(__SUNPRO_CC) && BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590) )
 
     typedef T * (this_type::*unspecified_bool_type)() const;