[Boost-commit] svn:boost r76299 - branches/release/boost/move

Subject: [Boost-commit] svn:boost r76299 - branches/release/boost/move
From: igaztanaga_at_[hidden]
Date: 2012-01-03 17:03:56

Author: igaztanaga
Date: 2012-01-03 17:03:56 EST (Tue, 03 Jan 2012)
New Revision: 76299
URL: http://svn.boost.org/trac/boost/changeset/76299

Log:
Merged changeset 76271 https://svn.boost.org/trac/boost/changeset/76271
Text files modified: 
   branches/release/boost/move/move.hpp |     7 ++++++-                                 
   1 files changed, 6 insertions(+), 1 deletions(-)

Modified: branches/release/boost/move/move.hpp
==============================================================================
--- branches/release/boost/move/move.hpp	(original)
+++ branches/release/boost/move/move.hpp	2012-01-03 17:03:56 EST (Tue, 03 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;
    }