Index: ../example/make_future.cpp
===================================================================
--- ../example/make_future.cpp	(revision 83403)
+++ ../example/make_future.cpp	(working copy)
@@ -10,6 +10,15 @@
 
 int p1() { return 5; }
 
+void p() { }
+
+#if defined BOOST_THREAD_USES_MOVE
+boost::future<void> void_compute()
+{
+  return BOOST_THREAD_MAKE_RV_REF(boost::make_future());
+}
+#endif
+
 boost::future<int> compute(int x)
 {
   if (x == 0) return boost::make_future(0);
@@ -30,11 +39,21 @@
 
 int main()
 {
+#if defined BOOST_THREAD_USES_MOVE
   {
+    boost::future<void> f = void_compute();
+    f.get();
+  }
+#endif
+  {
     boost::future<int> f = compute(2);
     std::cout << f.get() << std::endl;
   }
   {
+    boost::future<int> f = compute(0);
+    std::cout << f.get() << std::endl;
+  }
+  {
     boost::shared_future<int> f = shared_compute(2);
     std::cout << f.get() << std::endl;
   }
Index: ../../../boost/thread/future.hpp
===================================================================
--- ../../../boost/thread/future.hpp	(revision 83403)
+++ ../../../boost/thread/future.hpp	(working copy)
@@ -1677,7 +1677,7 @@
                 boost::throw_exception(future_already_retrieved());
             }
             future_obtained=true;
-            return BOOST_THREAD_FUTURE<R>(future_);
+            return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<R>(future_));
         }
 
         void set_value(typename detail::future_traits<R>::source_reference_type r)
@@ -1844,7 +1844,7 @@
                 boost::throw_exception(future_already_retrieved());
             }
             future_obtained=true;
-            return BOOST_THREAD_FUTURE<R&>(future_);
+            return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<R&>(future_));
         }
 
         void set_value(R& r)
@@ -1990,6 +1990,9 @@
             }
             future_obtained=true;
             return BOOST_THREAD_FUTURE<void>(future_);
+            //return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<void>(future_));
+            //BOOST_THREAD_FUTURE<void> res;
+            //return boost::move(res);
         }
 
         void set_value()
@@ -2939,7 +2942,7 @@
             {
                 future_obtained=true;
                 //return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<R>(task));
-                return BOOST_THREAD_FUTURE<R>(task);
+                return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<R>(task));
             }
             else
             {
@@ -3139,12 +3142,12 @@
         if (int(policy) & int(launch::async))
         {
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-          return boost::detail::make_future_async_object<Rp>(
+          return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_async_object<Rp>(
               BF(
                   thread_detail::decay_copy(boost::forward<F>(f))
                   , thread_detail::decay_copy(boost::forward<ArgTypes>(args))...
               )
-          );
+          ));
 #else
           packaged_task_type pt( boost::forward<F>(f) );
 
@@ -3160,12 +3163,12 @@
         else if (int(policy) & int(launch::deferred))
         {
 #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
-          return boost::detail::make_future_deferred_object<Rp>(
+          return BOOST_THREAD_MAKE_RV_REF(boost::detail::make_future_deferred_object<Rp>(
               BF(
                   thread_detail::decay_copy(boost::forward<F>(f))
                   , thread_detail::decay_copy(boost::forward<ArgTypes>(args))...
               )
-          );
+          ));
 #else
               BOOST_THREAD_FUTURE<R> ret;
               return ::boost::move(ret);
@@ -3194,14 +3197,14 @@
         BOOST_THREAD_FUTURE<R>
         async(R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(ArgTypes)... args)
         {
-          return async(launch(launch::any), f, boost::forward<ArgTypes>(args)...);
+          return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), f, boost::forward<ArgTypes>(args)...));
         }
 #else
         template <class R>
         BOOST_THREAD_FUTURE<R>
         async(R(*f)())
         {
-          return async(launch(launch::any), f);
+          return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), f));
         }
 #endif
 #endif
@@ -3213,14 +3216,14 @@
         )>::type>
         async(BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args)
         {
-            return async(launch(launch::any), boost::forward<F>(f), boost::forward<ArgTypes>(args)...);
+            return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), boost::forward<F>(f), boost::forward<ArgTypes>(args)...));
         }
 #else
         template <class F>
         BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type>
         async(BOOST_THREAD_RV_REF(F) f)
         {
-            return async(launch(launch::any), boost::forward<F>(f));
+            return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), boost::forward<F>(f)));
         }
 #endif
 
@@ -3237,13 +3240,14 @@
     return BOOST_THREAD_MAKE_RV_REF(p.get_future());
   }
 
-
+#if defined BOOST_THREAD_USES_MOVE
   inline BOOST_THREAD_FUTURE<void> make_future()
   {
     promise<void> p;
-    return p.get_future();
-
+    p.set_value();
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future());
   }
+#endif
 
   ////////////////////////////////
   // make_shared_future
@@ -3397,10 +3401,10 @@
           new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(*this, boost::forward<F>(func), policy);
       if (ptr==0)
       {
-        return BOOST_THREAD_FUTURE<future_type>();
+        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
       }
       this->future_->set_continuation_ptr(ptr, lock);
-      return ptr->next.get_future();
+      return BOOST_THREAD_MAKE_RV_REF(ptr->next.get_future());
     }
     else
     {
@@ -3421,16 +3425,20 @@
     {
       boost::unique_lock<boost::mutex> lock(this->future_->mutex);
       detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, F > *ptr =
-          new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(*this, boost::forward<F>(func));
+          new
+          //BOOST_THREAD_MAKE_RV_REF((
+              detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(*this, boost::forward<F>(func))
+              //))
+              ;
       if (ptr==0)
       {
-        return BOOST_THREAD_FUTURE<future_type>();
+        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
       }
       this->future_->set_continuation_ptr(ptr, lock);
       return ptr->next.get_future();
     } else {
       // fixme what to do when the future has no associated state?
-      return BOOST_THREAD_FUTURE<future_type>();
+      return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
     }
 
   }
@@ -3447,16 +3455,20 @@
     {
       boost::unique_lock<boost::mutex> lock(this->future_->mutex);
       detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&) > *ptr =
-          new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func);
+          new
+          //BOOST_THREAD_MAKE_RV_REF((
+              detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func)
+           //   ))
+      ;
       if (ptr==0)
       {
-        return BOOST_THREAD_FUTURE<future_type>();
+        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
       }
       this->future_->set_continuation_ptr(ptr, lock);
       return ptr->next.get_future();
     } else {
       // fixme what to do when the future has no associated state?
-      return BOOST_THREAD_FUTURE<future_type>();
+      return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
     }
 
   }
@@ -3472,16 +3484,20 @@
     {
       boost::unique_lock<boost::mutex> lock(this->future_->mutex);
       detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&) > *ptr =
-          new detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func, policy);
+          new
+          //BOOST_THREAD_MAKE_RV_REF((
+              detail::future_continuation<BOOST_THREAD_FUTURE<R>, future_type, RF(*)(BOOST_THREAD_FUTURE&)>(*this, func, policy)
+            //  ))
+      ;
       if (ptr==0)
       {
-        return BOOST_THREAD_FUTURE<future_type>();
+        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
       }
       this->future_->set_continuation_ptr(ptr, lock);
       return ptr->next.get_future();
     } else {
       // fixme what to do when the future has no associated state?
-      return BOOST_THREAD_FUTURE<future_type>();
+      return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
     }
 
   }