[Boost-commit] svn:boost r81334 - in branches/release: . boost boost/smart_ptr/detail

Subject: [Boost-commit] svn:boost r81334 - in branches/release: . boost boost/smart_ptr/detail
From: pdimov_at_[hidden]
Date: 2012-11-14 06:57:59

Author: pdimov
Date: 2012-11-14 06:57:58 EST (Wed, 14 Nov 2012)
New Revision: 81334
URL: http://svn.boost.org/trac/boost/changeset/81334

Log:
Merged [81128] from trunk. Fixes #7141.
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
Text files modified: 
   branches/release/boost/smart_ptr/detail/sp_has_sync.hpp |    14 +++++++++-----                          
   1 files changed, 9 insertions(+), 5 deletions(-)

Modified: branches/release/boost/smart_ptr/detail/sp_has_sync.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/sp_has_sync.hpp	(original)
+++ branches/release/boost/smart_ptr/detail/sp_has_sync.hpp	2012-11-14 06:57:58 EST (Wed, 14 Nov 2012)
@@ -22,7 +22,15 @@
 
 #ifndef BOOST_SP_NO_SYNC
 
-#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#if defined( __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 )
+
+# define BOOST_SP_HAS_SYNC
+
+#elif defined( __IBMCPP__ ) && ( __IBMCPP__ >= 1210 )
+
+# define BOOST_SP_HAS_SYNC
+
+#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
 
 #define BOOST_SP_HAS_SYNC
 
@@ -54,10 +62,6 @@
 #undef BOOST_SP_HAS_SYNC
 #endif
 
-#elif defined( __IBMCPP__ ) && ( __IBMCPP__ >= 1210 )
-
-#define BOOST_SP_HAS_SYNC
-
 #endif
 
 #endif // #ifndef BOOST_SP_NO_SYNC