From 7024b377891190ef1dd07123e96fb666beeb283d Mon Sep 17 00:00:00 2001
From: Thomas Bernard <thomas@famillebernargouriou.fr>
Date: Sat, 16 Jan 2016 09:15:31 +0100
Subject: [PATCH] Use boost move to implement movable only wrapper class

---
 include/turtle/detail/function_impl_template.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/turtle/detail/function_impl_template.hpp b/include/turtle/detail/function_impl_template.hpp
index 1f731e3..116b4e1 100644
--- a/include/turtle/detail/function_impl_template.hpp
+++ b/include/turtle/detail/function_impl_template.hpp
@@ -7,6 +7,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include "expectation_template.hpp"
+#include <boost/move/utility.hpp>
 #include <atomic>
 
 #ifndef MOCK_ERROR_POLICY
@@ -108,14 +109,17 @@ namespace detail
 
         struct wrapper : wrapper_base< R, expectation_type >
         {
+            private:
+                BOOST_MOVABLE_BUT_NOT_COPYABLE(wrapper);
+
+            public:
+
             wrapper( const boost::shared_ptr< mutex >& m, expectation_type& e )
                 : wrapper_base< R, expectation_type >( e )
                 , lock_( m )
             {}
 
-            wrapper(const wrapper &) = delete;
-
-            wrapper( wrapper && w)
+            wrapper( BOOST_RV_REF(wrapper) w)
                 : wrapper_base< R, expectation_type > (*w.e_)
                 , lock_( std::move(w.lock_) )
             {