[Boost-commit] svn:boost r76268 - trunk/boost/thread/detail

Subject: [Boost-commit] svn:boost r76268 - trunk/boost/thread/detail
From: vicente.botet_at_[hidden]
Date: 2012-01-01 19:33:34

Author: viboes
Date: 2012-01-01 19:33:32 EST (Sun, 01 Jan 2012)
New Revision: 76268
URL: http://svn.boost.org/trac/boost/changeset/76268

Log:
Thread: Try to solve #6341 Boost.Thread defines boost::move which conflicts with Boost.Move
Text files modified: 
   trunk/boost/thread/detail/move.hpp |    30 +++++++++++++++---------------          
   1 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/boost/thread/detail/move.hpp
==============================================================================
--- trunk/boost/thread/detail/move.hpp	(original)
+++ trunk/boost/thread/detail/move.hpp	2012-01-01 19:33:32 EST (Sun, 01 Jan 2012)
@@ -12,23 +12,15 @@
 #include <boost/type_traits/remove_reference.hpp>
 #endif
 
+#ifndef BOOST_NO_RVALUE_REFERENCES
+#include <boost/move/move.hpp>
+#endif
+
 #include <boost/config/abi_prefix.hpp>
 
 namespace boost
 {
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
-
-  template <class T>
-  typename remove_reference<T>::type&&
-  move(T&& t)
-  {
-      typedef typename remove_reference<T>::type Up;
-      return static_cast<Up&&>(t);
-  }
-
-#endif
-
     namespace detail
     {
         template<typename T>
@@ -53,20 +45,28 @@
         };
     }
 
+#ifdef BOOST_THREAD_USES_SPECIFIC_MOVE_NS
+namespace threads {
+#endif
+
+
 #ifndef BOOST_NO_SFINAE
     template<typename T>
-    typename enable_if<boost::is_convertible<T&,detail::thread_move_t<T> >, detail::thread_move_t<T> >::type move(T& t)
+    typename enable_if<boost::is_convertible<T&,boost::detail::thread_move_t<T> >, boost::detail::thread_move_t<T> >::type move(T& t)
     {
-        return detail::thread_move_t<T>(t);
+        return boost::detail::thread_move_t<T>(t);
     }
 #endif
 
     template<typename T>
-    detail::thread_move_t<T> move(detail::thread_move_t<T> t)
+    boost::detail::thread_move_t<T> move(boost::detail::thread_move_t<T> t)
     {
         return t;
     }
 
+#ifdef BOOST_THREAD_USES_SPECIFIC_MOVE_NS
+}
+#endif
 
 }