[Boost-commit] svn:boost r80474 - trunk/boost/thread/win32

Subject: [Boost-commit] svn:boost r80474 - trunk/boost/thread/win32
From: vicente.botet_at_[hidden]
Date: 2012-09-09 15:25:04

Author: viboes
Date: 2012-09-09 15:25:03 EDT (Sun, 09 Sep 2012)
New Revision: 80474
URL: http://svn.boost.org/trac/boost/changeset/80474

Log:
Thread: Apply patch for 6931.
Text files modified: 
   trunk/boost/thread/win32/thread_primitives.hpp |     4 ++--                                    
   1 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- trunk/boost/thread/win32/thread_primitives.hpp	(original)
+++ trunk/boost/thread/win32/thread_primitives.hpp	2012-09-09 15:25:03 EDT (Sun, 09 Sep 2012)
@@ -299,7 +299,7 @@
     }
 }
 
-#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 @@
     }
 }
 #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