[Boost-commit] svn:boost r48834 - trunk/boost/detail

Subject: [Boost-commit] svn:boost r48834 - trunk/boost/detail
From: pdimov_at_[hidden]
Date: 2008-09-17 18:31:13

Author: pdimov
Date: 2008-09-17 18:31:13 EDT (Wed, 17 Sep 2008)
New Revision: 48834
URL: http://svn.boost.org/trac/boost/changeset/48834

Log:
Fix #2310.
Text files modified: 
   trunk/boost/detail/spinlock.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/detail/spinlock.hpp
==============================================================================
--- trunk/boost/detail/spinlock.hpp	(original)
+++ trunk/boost/detail/spinlock.hpp	2008-09-17 18:31:13 EDT (Wed, 17 Sep 2008)
@@ -30,9 +30,9 @@
 
 #include <boost/config.hpp>
 
-#if defined(__GNUC__) && defined( __arm__ )
+#if defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ )
 #  include <boost/detail/spinlock_gcc_arm.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ )
 #  include <boost/detail/spinlock_sync.hpp>
 #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
 #  include <boost/detail/spinlock_w32.hpp>