Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r80475 - trunk/boost/thread/win32
From: vicente.botet_at_[hidden]
Date: 2012-09-09 15:26:48


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

Log:
Thread: complete update for 7345 on windows.
Text files modified:
   trunk/boost/thread/win32/basic_recursive_mutex.hpp | 6 +++---
   trunk/boost/thread/win32/basic_timed_mutex.hpp | 2 +-
   trunk/boost/thread/win32/interlocked_read.hpp | 19 ++++++++++---------
   3 files changed, 14 insertions(+), 13 deletions(-)

Modified: trunk/boost/thread/win32/basic_recursive_mutex.hpp
==============================================================================
--- trunk/boost/thread/win32/basic_recursive_mutex.hpp (original)
+++ trunk/boost/thread/win32/basic_recursive_mutex.hpp 2012-09-09 15:26:47 EDT (Sun, 09 Sep 2012)
@@ -42,7 +42,7 @@
                 mutex.destroy();
             }
 
- bool try_lock() // BOOST_NOEXCEPT
+ bool try_lock() BOOST_NOEXCEPT
             {
                 long const current_thread_id=win32::GetCurrentThreadId();
                 return try_recursive_lock(current_thread_id) || try_basic_lock(current_thread_id);
@@ -93,7 +93,7 @@
             }
 
         private:
- bool try_recursive_lock(long current_thread_id) // BOOST_NOEXCEPT
+ bool try_recursive_lock(long current_thread_id) BOOST_NOEXCEPT
             {
                 if(::boost::detail::interlocked_read_acquire(&locking_thread_id)==current_thread_id)
                 {
@@ -103,7 +103,7 @@
                 return false;
             }
 
- bool try_basic_lock(long current_thread_id) // BOOST_NOEXCEPT
+ bool try_basic_lock(long current_thread_id) BOOST_NOEXCEPT
             {
                 if(mutex.try_lock())
                 {

Modified: trunk/boost/thread/win32/basic_timed_mutex.hpp
==============================================================================
--- trunk/boost/thread/win32/basic_timed_mutex.hpp (original)
+++ trunk/boost/thread/win32/basic_timed_mutex.hpp 2012-09-09 15:26:47 EDT (Sun, 09 Sep 2012)
@@ -58,7 +58,7 @@
             }
 
 
- bool try_lock()
+ bool try_lock() BOOST_NOEXCEPT
             {
                 return !win32::interlocked_bit_test_and_set(&active_count,lock_flag_bit);
             }

Modified: trunk/boost/thread/win32/interlocked_read.hpp
==============================================================================
--- trunk/boost/thread/win32/interlocked_read.hpp (original)
+++ trunk/boost/thread/win32/interlocked_read.hpp 2012-09-09 15:26:47 EDT (Sun, 09 Sep 2012)
@@ -4,13 +4,14 @@
 // interlocked_read_win32.hpp
 //
 // (C) Copyright 2005-8 Anthony Williams
+// (C) Copyright 2012 Vicente J. Botet Escriba
 //
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/detail/interlocked.hpp>
-//#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/config.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 
@@ -23,25 +24,25 @@
 {
     namespace detail
     {
- inline long interlocked_read_acquire(long volatile* x) //BOOST_NOEXCEPT
+ inline long interlocked_read_acquire(long volatile* x) BOOST_NOEXCEPT
         {
             long const res=*x;
             _ReadWriteBarrier();
             return res;
         }
- inline void* interlocked_read_acquire(void* volatile* x) //BOOST_NOEXCEPT
+ inline void* interlocked_read_acquire(void* volatile* x) BOOST_NOEXCEPT
         {
             void* const res=*x;
             _ReadWriteBarrier();
             return res;
         }
 
- inline void interlocked_write_release(long volatile* x,long value) //BOOST_NOEXCEPT
+ inline void interlocked_write_release(long volatile* x,long value) BOOST_NOEXCEPT
         {
             _ReadWriteBarrier();
             *x=value;
         }
- inline void interlocked_write_release(void* volatile* x,void* value) //BOOST_NOEXCEPT
+ inline void interlocked_write_release(void* volatile* x,void* value) BOOST_NOEXCEPT
         {
             _ReadWriteBarrier();
             *x=value;
@@ -55,19 +56,19 @@
 {
     namespace detail
     {
- inline long interlocked_read_acquire(long volatile* x) //BOOST_NOEXCEPT
+ inline long interlocked_read_acquire(long volatile* x) BOOST_NOEXCEPT
         {
             return BOOST_INTERLOCKED_COMPARE_EXCHANGE(x,0,0);
         }
- inline void* interlocked_read_acquire(void* volatile* x) //BOOST_NOEXCEPT
+ inline void* interlocked_read_acquire(void* volatile* x) BOOST_NOEXCEPT
         {
             return BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(x,0,0);
         }
- inline void interlocked_write_release(long volatile* x,long value) //BOOST_NOEXCEPT
+ inline void interlocked_write_release(long volatile* x,long value) BOOST_NOEXCEPT
         {
             BOOST_INTERLOCKED_EXCHANGE(x,value);
         }
- inline void interlocked_write_release(void* volatile* x,void* value) //BOOST_NOEXCEPT
+ inline void interlocked_write_release(void* volatile* x,void* value) BOOST_NOEXCEPT
         {
             BOOST_INTERLOCKED_EXCHANGE_POINTER(x,value);
         }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk