From 6175baf858dada6cc5276dc2b02b9797afd50038 Mon Sep 17 00:00:00 2001
From: Peter Dimov <pdimov@pdimov.com>
Date: Wed, 17 Sep 2008 22:43:14 +0000
Subject: [PATCH] Fix #2000.

[SVN r48836]
---
 include/boost/detail/atomic_count.hpp    | 2 +-
 include/boost/detail/sp_counted_base.hpp | 2 +-
 include/boost/detail/spinlock.hpp        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/boost/detail/atomic_count.hpp b/include/boost/detail/atomic_count.hpp
index b731fcc..c53a63b 100644
--- a/include/boost/detail/atomic_count.hpp
+++ b/include/boost/detail/atomic_count.hpp
@@ -98,7 +98,7 @@ typedef long atomic_count;
 #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__)
diff --git a/include/boost/detail/sp_counted_base.hpp b/include/boost/detail/sp_counted_base.hpp
index 6d733d0..d576a49 100644
--- a/include/boost/detail/sp_counted_base.hpp
+++ b/include/boost/detail/sp_counted_base.hpp
@@ -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 ) )
diff --git a/include/boost/detail/spinlock.hpp b/include/boost/detail/spinlock.hpp
index 8a73999..d4e5bce 100644
--- a/include/boost/detail/spinlock.hpp
+++ b/include/boost/detail/spinlock.hpp
@@ -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>