From 2186eacee8284d34f945097e6f868656a5d1a866 Mon Sep 17 00:00:00 2001
From: "Vicente J. Botet Escriba" <vicente.botet@wanadoo.fr>
Date: Mon, 2 Jan 2012 12:16:49 +0000
Subject: [PATCH] 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

[SVN r76271]
---
 include/boost/move/move.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/boost/move/move.hpp b/include/boost/move/move.hpp
index 2330a5c..4a0f158 100644
--- a/include/boost/move/move.hpp
+++ b/include/boost/move/move.hpp
@@ -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;
    }