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

Subject: [Boost-commit] svn:boost r80203 - trunk/boost/thread/win32
From: vicente.botet_at_[hidden]
Date: 2012-08-25 09:21:21

Author: viboes
Date: 2012-08-25 09:21:21 EDT (Sat, 25 Aug 2012)
New Revision: 80203
URL: http://svn.boost.org/trac/boost/changeset/80203

Log:
Thread: take care of #7272 warning removal
Text files modified: 
   trunk/boost/thread/win32/thread_primitives.hpp |    14 +++++---------                          
   1 files changed, 5 insertions(+), 9 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-08-25 09:21:21 EDT (Sat, 25 Aug 2012)
@@ -10,7 +10,7 @@
 //  accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/config.hpp>
+#include <boost/thread/detail/config.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/assert.hpp>
 #include <boost/thread/exceptions.hpp>
@@ -341,15 +341,14 @@
         {
             inline bool interlocked_bit_test_and_set(long* x,long bit)
             {
-#if 0
-                __asm {
+#ifndef BOOST_INTEL_CXX_VERSION                 __asm {
                     mov eax,bit;
                     mov edx,x;
                     lock bts [edx],eax;
                     setc al;
                 };
 #else
-                bool ret;
+                bool ret=false;
                 __asm {
                     mov eax,bit; mov edx,x; lock bts [edx],eax; setc al; mov ret, al
                 };
@@ -360,17 +359,14 @@
 
             inline bool interlocked_bit_test_and_reset(long* x,long bit)
             {
-#if 0
-                __asm {
+#ifndef BOOST_INTEL_CXX_VERSION                 __asm {
                     mov eax,bit;
                     mov edx,x;
                     lock btr [edx],eax;
                     setc al;
                 };
 #else
-
-
-                bool ret;
+                bool ret=false;
                 __asm {
                     mov eax,bit; mov edx,x; lock btr [edx],eax; setc al; mov ret, al
                 };