[Boost-commit] svn:boost r76271 - trunk/boost/move

Subject: [Boost-commit] svn:boost r76271 - trunk/boost/move
From: vicente.botet_at_[hidden]
Date: 2012-01-02 07:16:49

Author: viboes
Date: 2012-01-02 07:16:49 EST (Mon, 02 Jan 2012)
New Revision: 76271
URL: http://svn.boost.org/trac/boost/changeset/76271

Log:
Move/Thread: Added type tait so that #6141 - Compilation error when boost.thread and boost.move are used together - can be solved on the Boost.Thread side
Text files modified: 
   trunk/boost/move/move.hpp |     7 ++++++-                                 
   1 files changed, 6 insertions(+), 1 deletions(-)

Modified: trunk/boost/move/move.hpp
==============================================================================
--- trunk/boost/move/move.hpp	(original)
+++ trunk/boost/move/move.hpp	2012-01-02 07:16:49 EST (Mon, 02 Jan 2012)
@@ -283,6 +283,10 @@
       : BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
    {};
 
+   template <class T>
+   struct has_move_emulation_enabled_aux 
+     : has_move_emulation_enabled<T> {};
+     
    template <class T> 
    struct has_nothrow_move
       : public BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
@@ -293,8 +297,9 @@
    //                            move()
    //
    //////////////////////////////////////////////////////////////////////////////
+    
    template <class T>
-   typename BOOST_MOVE_BOOST_NS::disable_if<has_move_emulation_enabled<T>, T&>::type move(T& x)
+   typename BOOST_MOVE_BOOST_NS::disable_if<has_move_emulation_enabled_aux<T>, T&>::type move(T& x)
    {
       return x;
    }