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

Subject: [Boost-commit] svn:boost r76039 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2011-12-18 09:31:37

Author: viboes
Date: 2011-12-18 09:31:36 EST (Sun, 18 Dec 2011)
New Revision: 76039
URL: http://svn.boost.org/trac/boost/changeset/76039

Log:
Thread: replace BOOST_HAS_RVALUE_REFS by BOOST_NO_RVALUE_REFERENCES and protect uses of thread_move_t
Text files modified: 
   trunk/boost/thread/locks.hpp |     7 +++++--                                 
   1 files changed, 5 insertions(+), 2 deletions(-)

Modified: trunk/boost/thread/locks.hpp
==============================================================================
--- trunk/boost/thread/locks.hpp	(original)
+++ trunk/boost/thread/locks.hpp	2011-12-18 09:31:36 EST (Sun, 18 Dec 2011)
@@ -553,7 +553,9 @@
         {
             timed_lock(target_time);
         }
+#ifndef BOOST_NO_RVALUE_REFERENCES
 
+#else
         shared_lock(detail::thread_move_t<shared_lock<Mutex> > other):
             m(other->m),is_locked(other->is_locked)
         {
@@ -614,6 +616,7 @@
             swap(temp);
             return *this;
         }
+#endif
 
 #ifndef BOOST_NO_RVALUE_REFERENCES
         void swap(shared_lock&& other)
@@ -758,7 +761,7 @@
         {
             try_lock();
         }
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_RVALUE_REFERENCES
         upgrade_lock(upgrade_lock<Mutex>&& other):
             m(other.m),is_locked(other.is_locked)
         {
@@ -938,7 +941,7 @@
             }
         }
 
-#ifdef BOOST_HAS_RVALUE_REFS
+#ifndef BOOST_NO_RVALUE_REFERENCES
         upgrade_to_unique_lock(upgrade_to_unique_lock<Mutex>&& other):
             source(other.source),exclusive(move(other.exclusive))
         {