From 4bb84c573ac1a044eb4e25438a97b0a1b7c11015 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 21 Sep 2008 21:33:54 +0000 Subject: [PATCH] Incorporate the fix from http://thread.gmane.org/gmane.comp.lib.boost.devel/176050 to make it work again on x86_64 using the Intel compiler. git-svn-id: https://svn.dealii.org/trunk@16885 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/boost/include/boost/detail/spinlock.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deal.II/contrib/boost/include/boost/detail/spinlock.hpp b/deal.II/contrib/boost/include/boost/detail/spinlock.hpp index e273647063..60bdeeb699 100644 --- a/deal.II/contrib/boost/include/boost/detail/spinlock.hpp +++ b/deal.II/contrib/boost/include/boost/detail/spinlock.hpp @@ -32,7 +32,8 @@ #if defined(__GNUC__) && defined( __arm__ ) # include -#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) +#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) \ + && ( !defined(__INTEL_COMPILER) || defined(__ia64) ) # include #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) # include -- 2.39.5