Subject: [Boost-commit] svn:boost r79577 - branches/release/boost/asio/detail
From: chris_at_[hidden]
Date: 2012-07-17 19:37:35
Author: chris_kohlhoff
Date: 2012-07-17 19:37:34 EDT (Tue, 17 Jul 2012)
New Revision: 79577
URL: http://svn.boost.org/trac/boost/changeset/79577
Log:
Merge from trunk:
* Ensure use of __thread keyword is disabled for older Intel compilers.
Text files modified:
branches/release/boost/asio/detail/config.hpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Modified: branches/release/boost/asio/detail/config.hpp
==============================================================================
--- branches/release/boost/asio/detail/config.hpp (original)
+++ branches/release/boost/asio/detail/config.hpp 2012-07-17 19:37:34 EDT (Tue, 17 Jul 2012)
@@ -376,7 +376,11 @@
# if defined(__linux__)
# if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
# if ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)
-# define BOOST_ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
+# if !defined(__INTEL_COMPILER) && !defined(__ICL)
+# define BOOST_ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
+# elif defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1100)
+# define BOOST_ASIO_HAS_THREAD_KEYWORD_EXTENSION 1
+# endif // defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 1100)
# endif // ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)
# endif // defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
# endif // defined(__linux__)