Subject: [Boost-commit] svn:boost r48836 - trunk/boost/detail
From: pdimov_at_[hidden]
Date: 2008-09-17 18:43:15
Author: pdimov
Date: 2008-09-17 18:43:14 EDT (Wed, 17 Sep 2008)
New Revision: 48836
URL: http://svn.boost.org/trac/boost/changeset/48836
Log:
Fix #2000.
Text files modified:
trunk/boost/detail/atomic_count.hpp | 2 +-
trunk/boost/detail/sp_counted_base.hpp | 2 +-
trunk/boost/detail/spinlock.hpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
Modified: trunk/boost/detail/atomic_count.hpp
==============================================================================
--- trunk/boost/detail/atomic_count.hpp (original)
+++ trunk/boost/detail/atomic_count.hpp 2008-09-17 18:43:14 EDT (Wed, 17 Sep 2008)
@@ -98,7 +98,7 @@
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
# include <boost/detail/atomic_count_win32.hpp>
-#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa )
+#elif defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
# include <boost/detail/atomic_count_sync.hpp>
#elif defined(__GLIBCPP__) || defined(__GLIBCXX__)
Modified: trunk/boost/detail/sp_counted_base.hpp
==============================================================================
--- trunk/boost/detail/sp_counted_base.hpp (original)
+++ trunk/boost/detail/sp_counted_base.hpp 2008-09-17 18:43:14 EDT (Wed, 17 Sep 2008)
@@ -46,7 +46,7 @@
#elif defined( __GNUC__ ) && ( defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc ) )
# include <boost/detail/sp_counted_base_gcc_ppc.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && !defined( __hppa ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
# include <boost/detail/sp_counted_base_sync.hpp>
#elif defined(__GNUC__) && ( defined( __sparcv8 ) || defined( __sparcv9 ) )
Modified: trunk/boost/detail/spinlock.hpp
==============================================================================
--- trunk/boost/detail/spinlock.hpp (original)
+++ trunk/boost/detail/spinlock.hpp 2008-09-17 18:43:14 EDT (Wed, 17 Sep 2008)
@@ -32,7 +32,7 @@
#if defined(__GNUC__) && defined( __arm__ ) && !defined( __thumb__ )
# include <boost/detail/spinlock_gcc_arm.hpp>
-#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ )
+#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined( __arm__ ) && ( !defined( __INTEL_COMPILER ) || defined( __ia64__ ) )
# include <boost/detail/spinlock_sync.hpp>
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
# include <boost/detail/spinlock_w32.hpp>