[Boost-commit] svn:boost r80955 - in branches/release: boost/thread boost/thread/win32 libs/thread

Subject: [Boost-commit] svn:boost r80955 - in branches/release: boost/thread boost/thread/win32 libs/thread
From: vicente.botet_at_[hidden]
Date: 2012-10-11 11:56:22

Author: viboes
Date: 2012-10-11 11:56:21 EDT (Thu, 11 Oct 2012)
New Revision: 80955
URL: http://svn.boost.org/trac/boost/changeset/80955

Log:
Thread: Merge 80757
Properties modified: 
   branches/release/boost/thread/   (props changed)
   branches/release/libs/thread/   (props changed)
Text files modified: 
   branches/release/boost/thread/win32/thread_primitives.hpp |    20 ++++++++++++++------                    
   1 files changed, 14 insertions(+), 6 deletions(-)

Modified: branches/release/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- branches/release/boost/thread/win32/thread_primitives.hpp	(original)
+++ branches/release/boost/thread/win32/thread_primitives.hpp	2012-10-11 11:56:21 EDT (Thu, 11 Oct 2012)
@@ -299,7 +299,7 @@
     }
 }
 
-#if (defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)) && (_MSC_VER>=1400)  && !defined(UNDER_CE)
+#if defined(BOOST_MSVC) && (_MSC_VER>=1400)  && !defined(UNDER_CE)
 
 namespace boost
 {
@@ -332,7 +332,7 @@
     }
 }
 #define BOOST_THREAD_BTS_DEFINED
-#elif defined(BOOST_MSVC) && defined(_M_IX86)
+#elif (defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)) && defined(_M_IX86)
 namespace boost
 {
     namespace detail
@@ -349,9 +349,13 @@
                     setc al;
                 };
 #else
-                bool ret=false;
+                bool ret;
                 __asm {
-                    mov eax,bit; mov edx,x; lock bts [edx],eax; setc al; mov ret, al
+                    mov eax,bit
+                    mov edx,x
+                    lock bts [edx],eax
+                    setc al
+                    mov ret, al
                 };
                 return ret;
 
@@ -368,9 +372,13 @@
                     setc al;
                 };
 #else
-                bool ret=false;
+                bool ret;
                 __asm {
-                    mov eax,bit; mov edx,x; lock btr [edx],eax; setc al; mov ret, al
+                    mov eax,bit
+                    mov edx,x
+                    lock btr [edx],eax
+                    setc al
+                    mov ret, al
                 };
                 return ret;