From a56358c8f8596123cb53462ff697b1bfc5b6529d Mon Sep 17 00:00:00 2001 From: "Vicente J. Botet Escriba" Date: Sun, 9 Sep 2012 19:25:03 +0000 Subject: [PATCH] Thread: Apply patch for 6931. [SVN r80474] --- include/boost/thread/win32/thread_primitives.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/thread/win32/thread_primitives.hpp b/include/boost/thread/win32/thread_primitives.hpp index a68548e8..0f5dc08d 100644 --- a/include/boost/thread/win32/thread_primitives.hpp +++ b/include/boost/thread/win32/thread_primitives.hpp @@ -299,7 +299,7 @@ namespace boost } } -#if defined(BOOST_MSVC) && (_MSC_VER>=1400) && !defined(UNDER_CE) +#if (defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)) && (_MSC_VER>=1400) && !defined(UNDER_CE) namespace boost { @@ -332,7 +332,7 @@ namespace boost } } #define BOOST_THREAD_BTS_DEFINED -#elif (defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)) && defined(_M_IX86) +#elif defined(BOOST_MSVC) && defined(_M_IX86) namespace boost { namespace detail