[Boost-commit] svn:boost r44846 - trunk/boost/thread

From: anthony_at_[hidden]
Date: 2008-04-28 08:26:28

Author: anthonyw
Date: 2008-04-28 08:26:27 EDT (Mon, 28 Apr 2008)
New Revision: 44846
URL: http://svn.boost.org/trac/boost/changeset/44846

Log:
Updated locks.hpp to work with gcc as well as msvc
Text files modified: 
   trunk/boost/thread/locks.hpp |    10 +++-------                              
   1 files changed, 3 insertions(+), 7 deletions(-)

Modified: trunk/boost/thread/locks.hpp
==============================================================================
--- trunk/boost/thread/locks.hpp	(original)
+++ trunk/boost/thread/locks.hpp	2008-04-28 08:26:27 EDT (Mon, 28 Apr 2008)
@@ -606,7 +606,7 @@
                 base(m_,defer_lock)
             {}
             try_lock_wrapper(Mutex& m_,try_to_lock_t):
-                base(m,try_to_lock)
+                base(m_,try_to_lock)
             {}
             try_lock_wrapper(detail::thread_move_t<try_lock_wrapper<Mutex> > other):
                 base(detail::thread_move_t<base>(*other))
@@ -645,12 +645,8 @@
             using base::operator!;
             using base::mutex;
             using base::release;
-        
-            typedef void (unique_lock::*bool_type)();
-            operator bool_type() const
-            {
-                return owns_lock()?&unique_lock::lock:0;
-            }
+            typedef typename base::bool_type bool_type;
+            using base::operator bool_type;
         };
     }
 }