From 7122ea390153d4cac80b1816ba226ebac41734c3 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 16 Sep 2008 12:58:22 +0200 Subject: [PATCH] [boost] compile fix for boost's spinlock for intel compiler --- libs/boost/boost/detail/spinlock.hpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libs/boost/boost/detail/spinlock.hpp b/libs/boost/boost/detail/spinlock.hpp index 4d37c22..13ad668 100644 --- a/libs/boost/boost/detail/spinlock.hpp +++ b/libs/boost/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 -- 1.5.4.3