passenger 4.0.20 → 4.0.21

data/ext/boost/thread/externally_locked_stream.hpp

@@ -0,0 +1,170 @@
+// (C) Copyright 2012 Vicente J. Botet Escriba
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+
+#ifndef BOOST_THREAD_EXTERNALLY_LOCKED_STREAM_HPP
+#define BOOST_THREAD_EXTERNALLY_LOCKED_STREAM_HPP
+
+#include <boost/thread/detail/config.hpp>
+#include <boost/thread/detail/move.hpp>
+#include <boost/thread/detail/delete.hpp>
+
+#include <boost/thread/externally_locked.hpp>
+#include <boost/thread/lock_traits.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+#include <boost/thread/strict_lock.hpp>
+
+#include <boost/config/abi_prefix.hpp>
+
+namespace boost
+{
+
+  template <typename Stream, typename RecursiveMutex=recursive_mutex>
+  class externally_locked_stream;
+
+  template <class Stream, typename RecursiveMutex=recursive_mutex>
+  class stream_guard
+  {
+
+    friend class externally_locked_stream<Stream, RecursiveMutex> ;
+  public:
+    typedef typename externally_locked_stream<Stream, RecursiveMutex>::mutex_type mutex_type;
+
+    BOOST_THREAD_MOVABLE_ONLY( stream_guard)
+
+    stream_guard(externally_locked_stream<Stream, RecursiveMutex>& mtx) :
+      mtx_(&mtx)
+    {
+      mtx.lock();
+    }
+
+    stream_guard(externally_locked_stream<Stream, RecursiveMutex>& mtx, adopt_lock_t) :
+      mtx_(&mtx)
+    {
+    }
+
+    stream_guard(BOOST_THREAD_RV_REF(stream_guard) rhs) BOOST_NOEXCEPT
+    : mtx_(rhs.mtx_)
+    {
+      rhs.mtx_= 0;
+    }
+
+    ~stream_guard()
+    {
+      if (mtx_ != 0) mtx_->unlock();
+    }
+
+    bool owns_lock(const mutex_type * l) const BOOST_NOEXCEPT
+    {
+      return l == mtx_->mutex();
+    }
+
+    /**
+     * @Requires mtx_
+     */
+    Stream& get() const
+    {
+      BOOST_THREAD_ASSERT_PRECONDITION(  mtx_, lock_error() );
+      return mtx_->get(*this);
+    }
+    Stream& bypass() const
+    {
+      return get();
+    }
+
+
+  private:
+    externally_locked_stream<Stream, RecursiveMutex>* mtx_;
+  };
+
+  template <typename Stream, typename RecursiveMutex>
+  struct is_strict_lock_sur_parole<stream_guard<Stream, RecursiveMutex> > : true_type
+  {
+  };
+
+  /**
+   * externally_locked_stream cloaks a reference to an stream of type Stream, and actually
+   * provides full access to that object through the get and set member functions, provided you
+   * pass a reference to a strict lock object.
+   */
+
+  //[externally_locked_stream
+  template <typename Stream, typename RecursiveMutex>
+  class externally_locked_stream: public externally_locked<Stream&, RecursiveMutex>
+  {
+    typedef externally_locked<Stream&, RecursiveMutex> base_type;
+  public:
+    BOOST_THREAD_NO_COPYABLE( externally_locked_stream)
+
+    /**
+     * Effects: Constructs an externally locked object storing the cloaked reference object.
+     */
+    externally_locked_stream(Stream& stream, RecursiveMutex& mtx) BOOST_NOEXCEPT :
+      base_type(stream, mtx)
+    {
+    }
+
+    stream_guard<Stream, RecursiveMutex> hold() BOOST_NOEXCEPT
+    {
+      return stream_guard<Stream, RecursiveMutex> (*this);
+    }
+    Stream& bypass() const
+    {
+      stream_guard<Stream, RecursiveMutex> lk(*this);
+      return get(lk);
+    }
+  };
+  //]
+
+  template <typename Stream, typename RecursiveMutex, typename T>
+  inline const stream_guard<Stream, RecursiveMutex>& operator<<(const stream_guard<Stream, RecursiveMutex>& lck, T arg)
+  {
+    lck.get() << arg;
+    return lck;
+  }
+
+  template <typename Stream, typename RecursiveMutex>
+  inline const stream_guard<Stream, RecursiveMutex>& operator<<(const stream_guard<Stream, RecursiveMutex>& lck, Stream& (*arg)(Stream&))
+  {
+    lck.get() << arg;
+    return lck;
+  }
+
+  template <typename Stream, typename RecursiveMutex, typename T>
+  inline const stream_guard<Stream, RecursiveMutex>& operator>>(const stream_guard<Stream, RecursiveMutex>& lck, T& arg)
+  {
+    lck.get() >> arg;
+    return lck;
+  }
+
+  template <typename Stream, typename RecursiveMutex, typename T>
+  inline stream_guard<Stream, RecursiveMutex> operator<<(externally_locked_stream<Stream, RecursiveMutex>& mtx, T arg)
+  {
+    stream_guard<Stream, RecursiveMutex> lk(mtx);
+    mtx.get(lk) << arg;
+    return boost::move(lk);
+  }
+
+  template <typename Stream, typename RecursiveMutex>
+  inline stream_guard<Stream, RecursiveMutex> operator<<(externally_locked_stream<Stream, RecursiveMutex>& mtx, Stream& (*arg)(Stream&))
+  {
+    stream_guard<Stream, RecursiveMutex> lk(mtx);
+    mtx.get(lk) << arg;
+    return boost::move(lk);
+  }
+
+  template <typename Stream, typename RecursiveMutex, typename T>
+  inline stream_guard<Stream, RecursiveMutex> operator>>(externally_locked_stream<Stream, RecursiveMutex>& mtx, T& arg)
+  {
+    stream_guard<Stream, RecursiveMutex> lk(mtx);
+    mtx.get(lk) >> arg;
+    return boost::move(lk);
+  }
+
+}
+
+#include <boost/config/abi_suffix.hpp>
+
+#endif // header

data/ext/boost/thread/future.hpp

@@ -1,5 +1,5 @@
 //  (C) Copyright 2008-10 Anthony Williams
-//  (C) Copyright 2011-2012 Vicente J. Botet Escriba
+//  (C) Copyright 2011-2013 Vicente J. Botet Escriba
 //
 //  Distributed under the Boost Software License, Version 1.0. (See
 //  accompanying file LICENSE_1_0.txt or copy at
@@ -15,17 +15,21 @@
 
 #ifndef BOOST_NO_EXCEPTIONS
 
+//#include <boost/thread/detail/log.hpp>
 #include <boost/detail/scoped_enum_emulation.hpp>
 #include <stdexcept>
 #include <boost/thread/detail/move.hpp>
+#include <boost/thread/detail/async_func.hpp>
 #include <boost/thread/thread_time.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
+#include <boost/thread/lock_algorithms.hpp>
+#include <boost/thread/lock_types.hpp>
 #include <boost/exception_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <boost/type_traits/is_fundamental.hpp>
-#include <boost/type_traits/is_convertible.hpp>
+#include <boost/thread/detail/is_convertible.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <boost/type_traits/remove_cv.hpp>
 #include <boost/mpl/if.hpp>
@@ -36,11 +40,13 @@
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
 #include <boost/scoped_array.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <list>
 #include <boost/next_prior.hpp>
 #include <vector>
-#include <boost/system/error_code.hpp>
+
+#include <boost/thread/future_error_code.hpp>
 #ifdef BOOST_THREAD_USES_CHRONO
 #include <boost/chrono/system_clocks.hpp>
 #endif
@@ -50,7 +56,7 @@
 #endif
 
 #include <boost/utility/result_of.hpp>
-#include <boost/thread/thread.hpp>
+#include <boost/thread/thread_only.hpp>
 
 #if defined BOOST_THREAD_PROVIDES_FUTURE
 #define BOOST_THREAD_FUTURE future
@@ -58,34 +64,13 @@
 #define BOOST_THREAD_FUTURE unique_future
 #endif
 
-
 namespace boost
 {
 
-  //enum class future_errc
-  BOOST_SCOPED_ENUM_DECLARE_BEGIN(future_errc)
-  {
-      broken_promise,
-      future_already_retrieved,
-      promise_already_satisfied,
-      no_state
-  }
-  BOOST_SCOPED_ENUM_DECLARE_END(future_errc)
-
-  namespace system
-  {
-    template <>
-    struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc> : public true_type {};
-
-    #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
-    template <>
-    struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc::enum_type> : public true_type { };
-    #endif
-  }
-
   //enum class launch
   BOOST_SCOPED_ENUM_DECLARE_BEGIN(launch)
   {
+      none = 0,
       async = 1,
       deferred = 2,
       any = async | deferred
@@ -101,26 +86,6 @@ namespace boost
   }
   BOOST_SCOPED_ENUM_DECLARE_END(future_status)
 
-  BOOST_THREAD_DECL
-  const system::error_category& future_category() BOOST_NOEXCEPT;
-
-  namespace system
-  {
-    inline
-    error_code
-    make_error_code(future_errc e) //BOOST_NOEXCEPT
-    {
-        return error_code(underlying_cast<int>(e), boost::future_category());
-    }
-
-    inline
-    error_condition
-    make_error_condition(future_errc e) //BOOST_NOEXCEPT
-    {
-        return error_condition(underlying_cast<int>(e), future_category());
-    }
-  }
-
   class BOOST_SYMBOL_VISIBLE future_error
       : public std::logic_error
   {
@@ -136,11 +101,6 @@ namespace boost
       {
         return ec_;
       }
-      const char* what() const BOOST_THREAD_NOEXCEPT_OR_THROW
-      {
-        return code().message().c_str();
-      }
-
   };
 
     class BOOST_SYMBOL_VISIBLE future_uninitialized:
@@ -205,29 +165,107 @@ namespace boost
 
     namespace future_state
     {
-        enum state { uninitialized, waiting, ready, moved };
+        enum state { uninitialized, waiting, ready, moved, deferred };
     }
 
     namespace detail
     {
-        struct future_object_base
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+      template<typename F, typename Rp, typename Fp>
+      struct future_deferred_continuation;
+      template<typename F, typename Rp, typename Fp>
+      struct future_async_continuation;
+#endif
+
+        struct relocker
+        {
+            boost::unique_lock<boost::mutex>& lock_;
+            bool  unlocked_;
+
+            relocker(boost::unique_lock<boost::mutex>& lk):
+                lock_(lk)
+            {
+                lock_.unlock();
+                unlocked_=true;
+            }
+            ~relocker()
+            {
+              if (unlocked_) {
+                lock_.lock();
+              }
+            }
+            void lock() {
+              if (unlocked_) {
+                lock_.lock();
+                unlocked_=false;
+              }
+            }
+        private:
+            relocker& operator=(relocker const&);
+        };
+
+        struct future_object_base : enable_shared_from_this<future_object_base>
         {
+
             boost::exception_ptr exception;
             bool done;
-            bool thread_was_interrupted;
+            bool is_deferred_;
+            launch policy_;
+            bool is_constructed;
             boost::mutex mutex;
             boost::condition_variable waiters;
             typedef std::list<boost::condition_variable_any*> waiter_list;
             waiter_list external_waiters;
             boost::function<void()> callback;
+//#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+            bool thread_was_interrupted;
+//#endif
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+            typedef shared_ptr<future_object_base> continuation_ptr_type;
+#else
+            typedef shared_ptr<void> continuation_ptr_type;
+#endif
+            continuation_ptr_type continuation_ptr;
+
 
+//#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+            virtual void launch_continuation(boost::unique_lock<boost::mutex>&)
+            {
+            }
+//#endif
             future_object_base():
                 done(false),
-                thread_was_interrupted(false)
+                is_deferred_(false),
+                policy_(launch::none),
+                is_constructed(false)
+
+            // This declaration should be only included conditinally, but are included to maintain the same layout.
+//#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+              , thread_was_interrupted(false)
+//#endif
+            // This declaration should be only included conditinally, but are included to maintain the same layout.
+//#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+               , continuation_ptr()
+//#endif
             {}
             virtual ~future_object_base()
             {}
 
+            void set_deferred()
+            {
+              is_deferred_ = true;
+              set_launch_policy(launch::deferred);
+            }
+            void set_async()
+            {
+              is_deferred_ = false;
+              set_launch_policy(launch::async);
+            }
+            void set_launch_policy(launch policy)
+            {
+              policy_ = policy;
+            }
+
             waiter_list::iterator register_external_waiter(boost::condition_variable_any& cv)
             {
                 boost::unique_lock<boost::mutex> lock(mutex);
@@ -241,7 +279,31 @@ namespace boost
                 external_waiters.erase(it);
             }
 
-            void mark_finished_internal()
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+            void do_continuation(boost::unique_lock<boost::mutex>& lock)
+            {
+                if (continuation_ptr) {
+                  continuation_ptr->launch_continuation(lock);
+                  if (! lock.owns_lock())
+                    lock.lock();
+                  continuation_ptr.reset();
+                }
+            }
+#else
+            void do_continuation(boost::unique_lock<boost::mutex>&)
+            {
+            }
+#endif
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+            void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock)
+            {
+              continuation_ptr= continuation;
+              if (done) {
+                do_continuation(lock);
+              }
+            }
+#endif
+            void mark_finished_internal(boost::unique_lock<boost::mutex>& lock)
             {
                 done=true;
                 waiters.notify_all();
@@ -250,24 +312,13 @@ namespace boost
                 {
                     (*it)->notify_all();
                 }
+                do_continuation(lock);
             }
-
-            struct relocker
+            void make_ready()
             {
-                boost::unique_lock<boost::mutex>& lock;
-
-                relocker(boost::unique_lock<boost::mutex>& lock_):
-                    lock(lock_)
-                {
-                    lock.unlock();
-                }
-                ~relocker()
-                {
-                    lock.lock();
-                }
-            private:
-                relocker& operator=(relocker const&);
-            };
+              boost::unique_lock<boost::mutex> lock(mutex);
+              mark_finished_internal(lock);
+            }
 
             void do_callback(boost::unique_lock<boost::mutex>& lock)
             {
@@ -280,27 +331,49 @@ namespace boost
             }
 
 
-            void wait(bool rethrow=true)
+            void wait_internal(boost::unique_lock<boost::mutex> &lock, bool rethrow=true)
             {
-                boost::unique_lock<boost::mutex> lock(mutex);
-                do_callback(lock);
-                while(!done)
-                {
-                    waiters.wait(lock);
-                }
-                if(rethrow && thread_was_interrupted)
+              do_callback(lock);
+              //if (!done) // fixme why this doesn't work?
+              {
+                if (is_deferred_)
                 {
-                    throw boost::thread_interrupted();
+                  is_deferred_=false;
+                  execute(lock);
+                  //lock.unlock();
                 }
-                if(rethrow && exception)
+                else
                 {
-                    boost::rethrow_exception(exception);
+                  while(!done)
+                  {
+                      waiters.wait(lock);
+                  }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                  if(rethrow && thread_was_interrupted)
+                  {
+                      throw boost::thread_interrupted();
+                  }
+#endif
+                  if(rethrow && exception)
+                  {
+                      boost::rethrow_exception(exception);
+                  }
                 }
+              }
+            }
+            void wait(bool rethrow=true)
+            {
+                boost::unique_lock<boost::mutex> lock(mutex);
+                wait_internal(lock, rethrow);
             }
 
+#if defined BOOST_THREAD_USES_DATETIME
             bool timed_wait_until(boost::system_time const& target_time)
             {
                 boost::unique_lock<boost::mutex> lock(mutex);
+                if (is_deferred_)
+                    return false;
+
                 do_callback(lock);
                 while(!done)
                 {
@@ -312,7 +385,7 @@ namespace boost
                 }
                 return true;
             }
-
+#endif
 #ifdef BOOST_THREAD_USES_CHRONO
 
             template <class Clock, class Duration>
@@ -320,6 +393,8 @@ namespace boost
             wait_until(const chrono::time_point<Clock, Duration>& abs_time)
             {
               boost::unique_lock<boost::mutex> lock(mutex);
+              if (is_deferred_)
+                  return future_status::deferred;
               do_callback(lock);
               while(!done)
               {
@@ -332,38 +407,95 @@ namespace boost
               return future_status::ready;
             }
 #endif
-            void mark_exceptional_finish_internal(boost::exception_ptr const& e)
+            void mark_exceptional_finish_internal(boost::exception_ptr const& e, boost::unique_lock<boost::mutex>& lock)
             {
                 exception=e;
-                mark_finished_internal();
+                mark_finished_internal(lock);
             }
             void mark_exceptional_finish()
             {
-                boost::lock_guard<boost::mutex> lock(mutex);
-                mark_exceptional_finish_internal(boost::current_exception());
+                boost::unique_lock<boost::mutex> lock(mutex);
+                mark_exceptional_finish_internal(boost::current_exception(), lock);
             }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
             void mark_interrupted_finish()
             {
-                boost::lock_guard<boost::mutex> lock(mutex);
+                boost::unique_lock<boost::mutex> lock(mutex);
                 thread_was_interrupted=true;
-                mark_finished_internal();
+                mark_finished_internal(lock);
+            }
+            void set_interrupted_at_thread_exit()
+            {
+              unique_lock<boost::mutex> lk(mutex);
+              thread_was_interrupted=true;
+              if (has_value(lk))
+              {
+                  throw_exception(promise_already_satisfied());
+              }
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+            }
+#endif
+            void set_exception_at_thread_exit(exception_ptr e)
+            {
+              unique_lock<boost::mutex> lk(mutex);
+              if (has_value(lk))
+              {
+                  throw_exception(promise_already_satisfied());
+              }
+              exception=e;
+              this->is_constructed = true;
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
             }
             bool has_value()
             {
                 boost::lock_guard<boost::mutex> lock(mutex);
-                return done && !(exception || thread_was_interrupted);
+                return done && !(exception
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    || thread_was_interrupted
+#endif
+                );
+            }
+            bool has_value(unique_lock<boost::mutex>& )
+            {
+                return done && !(exception
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    || thread_was_interrupted
+#endif
+                );
             }
             bool has_exception()
             {
                 boost::lock_guard<boost::mutex> lock(mutex);
-                return done && (exception || thread_was_interrupted);
+                return done && (exception
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    || thread_was_interrupted
+#endif
+                    );
+            }
+            bool has_exception(unique_lock<boost::mutex>&)
+            {
+                return done && (exception
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    || thread_was_interrupted
+#endif
+                    );
+            }
+            bool is_deferred()  const BOOST_NOEXCEPT {
+                return is_deferred_;
+            }
+
+            launch launch_policy() const BOOST_NOEXCEPT
+            {
+                return policy_;
             }
 
             template<typename F,typename U>
             void set_wait_callback(F f,U* u)
             {
+                boost::lock_guard<boost::mutex> lock(mutex);
                 callback=boost::bind(f,boost::ref(*u));
             }
+            virtual void execute(boost::unique_lock<boost::mutex>&) {}
 
         private:
             future_object_base(future_object_base const&);
@@ -373,22 +505,27 @@ namespace boost
         template<typename T>
         struct future_traits
         {
-            typedef boost::scoped_ptr<T> storage_type;
+          typedef boost::scoped_ptr<T> storage_type;
+          struct dummy;
 #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-            typedef T const& source_reference_type;
-            struct dummy;
-            typedef typename boost::mpl::if_<boost::is_fundamental<T>,dummy&,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type;
-            typedef typename boost::mpl::if_<boost::is_fundamental<T>,T,BOOST_THREAD_RV_REF(T)>::type move_dest_type;
+          typedef T const& source_reference_type;
+          //typedef typename boost::mpl::if_<boost::is_fundamental<T>,dummy&,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type;
+          typedef BOOST_THREAD_RV_REF(T) rvalue_source_type;
+          //typedef typename boost::mpl::if_<boost::is_fundamental<T>,T,BOOST_THREAD_RV_REF(T)>::type move_dest_type;
+          typedef T move_dest_type;
 #elif defined BOOST_THREAD_USES_MOVE
-            typedef T& source_reference_type;
-            typedef typename boost::mpl::if_<boost::has_move_emulation_enabled<T>,BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type;
-            typedef typename boost::mpl::if_<boost::has_move_emulation_enabled<T>,BOOST_THREAD_RV_REF(T),T>::type move_dest_type;
+          typedef typename boost::mpl::if_c<boost::is_fundamental<T>::value,T,T&>::type source_reference_type;
+          //typedef typename boost::mpl::if_c<boost::is_fundamental<T>::value,T,BOOST_THREAD_RV_REF(T)>::type rvalue_source_type;
+          //typedef typename boost::mpl::if_c<boost::enable_move_utility_emulation<T>::value,BOOST_THREAD_RV_REF(T),T>::type move_dest_type;
+          typedef BOOST_THREAD_RV_REF(T) rvalue_source_type;
+          typedef T move_dest_type;
 #else
-            typedef T& source_reference_type;
-            typedef typename boost::mpl::if_<boost::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type;
-            typedef typename boost::mpl::if_<boost::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T>::type move_dest_type;
+          typedef T& source_reference_type;
+          typedef typename boost::mpl::if_<boost::thread_detail::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T const&>::type rvalue_source_type;
+          typedef typename boost::mpl::if_<boost::thread_detail::is_convertible<T&,BOOST_THREAD_RV_REF(T) >,BOOST_THREAD_RV_REF(T),T>::type move_dest_type;
 #endif
 
+
             typedef const T& shared_future_get_result_type;
 
             static void init(storage_type& storage,source_reference_type t)
@@ -398,7 +535,11 @@ namespace boost
 
             static void init(storage_type& storage,rvalue_source_type t)
             {
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+              storage.reset(new T(boost::forward<T>(t)));
+#else
               storage.reset(new T(static_cast<rvalue_source_type>(t)));
+#endif
             }
 
             static void cleanup(storage_type& storage)
@@ -412,8 +553,8 @@ namespace boost
         {
             typedef T* storage_type;
             typedef T& source_reference_type;
-            struct rvalue_source_type
-            {};
+            //struct rvalue_source_type
+            //{};
             typedef T& move_dest_type;
             typedef T& shared_future_get_result_type;
 
@@ -447,6 +588,7 @@ namespace boost
 
         };
 
+        // Used to create stand-alone futures
         template<typename T>
         struct future_object:
             detail::future_object_base
@@ -463,42 +605,163 @@ namespace boost
                 result(0)
             {}
 
-            void mark_finished_with_result_internal(source_reference_type result_)
+            ~future_object()
+            {}
+
+            void mark_finished_with_result_internal(source_reference_type result_, boost::unique_lock<boost::mutex>& lock)
             {
                 future_traits<T>::init(result,result_);
-                mark_finished_internal();
+                this->mark_finished_internal(lock);
             }
 
-            void mark_finished_with_result_internal(rvalue_source_type result_)
+            void mark_finished_with_result_internal(rvalue_source_type result_, boost::unique_lock<boost::mutex>& lock)
             {
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+                future_traits<T>::init(result,boost::forward<T>(result_));
+#else
                 future_traits<T>::init(result,static_cast<rvalue_source_type>(result_));
-                mark_finished_internal();
+#endif
+                this->mark_finished_internal(lock);
             }
 
             void mark_finished_with_result(source_reference_type result_)
             {
-                boost::lock_guard<boost::mutex> lock(mutex);
-                mark_finished_with_result_internal(result_);
+                boost::unique_lock<boost::mutex> lock(mutex);
+                this->mark_finished_with_result_internal(result_, lock);
             }
 
             void mark_finished_with_result(rvalue_source_type result_)
             {
-                boost::lock_guard<boost::mutex> lock(mutex);
-                mark_finished_with_result_internal(static_cast<rvalue_source_type>(result_));
+                boost::unique_lock<boost::mutex> lock(mutex);
+
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+                mark_finished_with_result_internal(boost::forward<T>(result_), lock);
+#else
+                mark_finished_with_result_internal(static_cast<rvalue_source_type>(result_), lock);
+#endif
             }
 
-            move_dest_type get()
+
+            virtual move_dest_type get()
             {
                 wait();
-                return static_cast<move_dest_type>(*result);
+                return boost::move(*result);
             }
 
             shared_future_get_result_type get_sh()
             {
                 wait();
-                return static_cast<shared_future_get_result_type>(*result);
+                return *result;
+            }
+
+            // todo move this to detail::future_object_base
+            future_state::state get_state()
+            {
+                boost::lock_guard<boost::mutex> guard(mutex);
+                if(!done)
+                {
+                    return future_state::waiting;
+                }
+                else
+                {
+                    return future_state::ready;
+                }
+            }
+
+
+            //void set_value_at_thread_exit(const T & result_)
+            void set_value_at_thread_exit(source_reference_type result_)
+            {
+              unique_lock<boost::mutex> lk(this->mutex);
+              if (this->has_value(lk))
+              {
+                  throw_exception(promise_already_satisfied());
+              }
+              //future_traits<T>::init(result,result_);
+              result.reset(new T(result_));
+
+              this->is_constructed = true;
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+            }
+            //void set_value_at_thread_exit(BOOST_THREAD_RV_REF(T) result_)
+            void set_value_at_thread_exit(rvalue_source_type result_)
+            {
+              unique_lock<boost::mutex> lk(this->mutex);
+              if (this->has_value(lk))
+                  throw_exception(promise_already_satisfied());
+              result.reset(new T(boost::move(result_)));
+              //future_traits<T>::init(result,static_cast<rvalue_source_type>(result_));
+              this->is_constructed = true;
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+            }
+
+
+        private:
+            future_object(future_object const&);
+            future_object& operator=(future_object const&);
+        };
+
+        template<typename T>
+        struct future_object<T&>:
+            detail::future_object_base
+        {
+            typedef typename future_traits<T&>::storage_type storage_type;
+            typedef typename future_traits<T&>::source_reference_type source_reference_type;
+            //typedef typename future_traits<T&>::rvalue_source_type rvalue_source_type;
+            typedef typename future_traits<T&>::move_dest_type move_dest_type;
+            typedef typename future_traits<T&>::shared_future_get_result_type shared_future_get_result_type;
+
+            T* result;
+
+            future_object():
+                result(0)
+            {}
+
+            ~future_object()
+            {
+            }
+
+            void mark_finished_with_result_internal(source_reference_type result_, boost::unique_lock<boost::mutex>& lock)
+            {
+                //future_traits<T>::init(result,result_);
+                result= &result_;
+                mark_finished_internal(lock);
+            }
+
+//            void mark_finished_with_result_internal(rvalue_source_type result_, boost::unique_lock<boost::mutex>& lock)
+//            {
+//                future_traits<T&>::init(result,static_cast<rvalue_source_type>(result_));
+//                mark_finished_internal(lock);
+//            }
+
+            void mark_finished_with_result(source_reference_type result_)
+            {
+                boost::unique_lock<boost::mutex> lock(mutex);
+                mark_finished_with_result_internal(result_, lock);
+            }
+
+//            void mark_finished_with_result(rvalue_source_type result_)
+//            {
+//                boost::unique_lock<boost::mutex> lock(mutex);
+//                mark_finished_with_result_internal(static_cast<rvalue_source_type>(result_), lock);
+//            }
+
+
+            T& get()
+            {
+                wait();
+                //return static_cast<T&>(*result);
+                return *result;
+            }
+
+            T& get_sh()
+            {
+                wait();
+                //return static_cast<shared_future_get_result_type>(*result);
+                return *result;
             }
 
+            // todo move this to detail::future_object_base
             future_state::state get_state()
             {
                 boost::lock_guard<boost::mutex> guard(mutex);
@@ -512,6 +775,27 @@ namespace boost
                 }
             }
 
+            void set_value_at_thread_exit(T& result_)
+            {
+              unique_lock<boost::mutex> lk(this->mutex);
+              if (this->has_value(lk))
+                  throw_exception(promise_already_satisfied());
+              //future_traits<T>::init(result,result_);
+              result= &result_;
+              this->is_constructed = true;
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+            }
+//            void set_value_at_thread_exit(rvalue_source_type result_)
+//            {
+//              unique_lock<boost::mutex> lk(this->mutex);
+//              if (this->has_value())
+//                  throw_exception(promise_already_satisfied());
+//              future_traits<T>::init(result,static_cast<rvalue_source_type>(result_));
+//              this->is_constructed = true;
+//              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+//            }
+
+
         private:
             future_object(future_object const&);
             future_object& operator=(future_object const&);
@@ -526,25 +810,26 @@ namespace boost
             future_object()
             {}
 
-            void mark_finished_with_result_internal()
+            void mark_finished_with_result_internal(boost::unique_lock<boost::mutex>& lock)
             {
-                mark_finished_internal();
+                mark_finished_internal(lock);
             }
 
             void mark_finished_with_result()
             {
-                boost::lock_guard<boost::mutex> lock(mutex);
-                mark_finished_with_result_internal();
+                boost::unique_lock<boost::mutex> lock(mutex);
+                mark_finished_with_result_internal(lock);
             }
 
             void get()
             {
-                wait();
+                this->wait();
             }
             void get_sh()
             {
                 wait();
             }
+            // todo move this to detail::future_object_base
             future_state::state get_state()
             {
                 boost::lock_guard<boost::mutex> guard(mutex);
@@ -557,50 +842,279 @@ namespace boost
                     return future_state::ready;
                 }
             }
+            void set_value_at_thread_exit()
+            {
+              unique_lock<boost::mutex> lk(this->mutex);
+              if (this->has_value(lk))
+              {
+                  throw_exception(promise_already_satisfied());
+              }
+             this->is_constructed = true;
+              get_current_thread_data()->make_ready_at_thread_exit(shared_from_this());
+            }
         private:
             future_object(future_object const&);
             future_object& operator=(future_object const&);
         };
 
-//        template<typename T, typename Allocator>
-//        struct future_object_alloc: public future_object<T>
-//        {
-//          typedef future_object<T> base;
-//          Allocator alloc_;
-//
-//        public:
-//          explicit future_object_alloc(const Allocator& a)
-//              : alloc_(a) {}
-//
-//        };
-        class future_waiter
+        /////////////////////////
+        /// future_async_object
+        /////////////////////////
+        template<typename Rp, typename Fp>
+        struct future_async_object: future_object<Rp>
         {
-            struct registered_waiter;
-            typedef std::vector<int>::size_type count_type;
+          typedef future_object<Rp> base_type;
+          typedef typename base_type::move_dest_type move_dest_type;
 
-            struct registered_waiter
-            {
-                boost::shared_ptr<detail::future_object_base> future_;
-                detail::future_object_base::waiter_list::iterator wait_iterator;
-                count_type index;
+          boost::thread thr_;
 
-                registered_waiter(boost::shared_ptr<detail::future_object_base> const& a_future,
-                                  detail::future_object_base::waiter_list::iterator wait_iterator_,
-                                  count_type index_):
-                    future_(a_future),wait_iterator(wait_iterator_),index(index_)
-                {}
+        public:
+          explicit future_async_object(BOOST_THREAD_FWD_REF(Fp) f) :
+            thr_(&future_async_object::run, this, boost::forward<Fp>(f))
+          {
+            this->set_async();
+          }
 
-            };
+          ~future_async_object()
+          {
+            if (thr_.joinable()) thr_.join();
+          }
 
-            struct all_futures_lock
+          move_dest_type get()
+          {
+              if (thr_.joinable()) thr_.join();
+              // fixme Is the lock needed during the whole scope?
+              //this->wait();
+              boost::unique_lock<boost::mutex> lock(this->mutex);
+              this->wait_internal(lock);
+
+              //return static_cast<move_dest_type>(*(this->result));
+              //return boost::move<Rp>(*(this->result));
+              return boost::move(*(this->result));
+          }
+          static void run(future_async_object* that, BOOST_THREAD_FWD_REF(Fp) f)
+          {
+            try
             {
-#ifdef _MANAGED
-                typedef std::ptrdiff_t count_type_portable;
-#else
-                typedef count_type count_type_portable;
+              that->mark_finished_with_result(f());
+            }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+            catch(thread_interrupted& )
+            {
+              that->mark_interrupted_finish();
+            }
 #endif
-                count_type_portable count;
-                boost::scoped_array<boost::unique_lock<boost::mutex> > locks;
+            catch(...)
+            {
+              that->mark_exceptional_finish();
+            }
+          }
+        };
+
+        template<typename Fp>
+        struct future_async_object<void, Fp>: public future_object<void>
+        {
+          typedef future_object<void> base_type;
+          boost::thread thr_;
+
+        public:
+          explicit future_async_object(BOOST_THREAD_FWD_REF(Fp) f) :
+            thr_(&future_async_object::run, this, boost::forward<Fp>(f))
+          {
+            this->set_async();
+          }
+
+          ~future_async_object()
+          {
+            if (thr_.joinable()) thr_.join();
+          }
+
+          static void run(future_async_object* that, BOOST_THREAD_FWD_REF(Fp) f)
+          {
+            try
+            {
+              f();
+              that->mark_finished_with_result();
+            }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+            catch(thread_interrupted& )
+            {
+              that->mark_interrupted_finish();
+            }
+#endif
+            catch(...)
+            {
+              that->mark_exceptional_finish();
+            }
+          }
+        };
+
+        template<typename Rp, typename Fp>
+        struct future_async_object<Rp&, Fp>: future_object<Rp&>
+        {
+          typedef future_object<Rp&> base_type;
+          typedef typename base_type::move_dest_type move_dest_type;
+
+          boost::thread thr_;
+
+        public:
+          explicit future_async_object(BOOST_THREAD_FWD_REF(Fp) f) :
+            thr_(&future_async_object::run, this, boost::forward<Fp>(f))
+          {
+            this->set_async();
+          }
+
+          ~future_async_object()
+          {
+            if (thr_.joinable()) thr_.join();
+          }
+
+          move_dest_type get()
+          {
+              if (thr_.joinable()) thr_.join();
+              // fixme Is the lock needed during the whole scope?
+              //this->wait();
+              boost::unique_lock<boost::mutex> lock(this->mutex);
+              this->wait_internal(lock);
+
+              //return static_cast<move_dest_type>(*(this->result));
+              return boost::move(*(this->result));
+          }
+          static void run(future_async_object* that, BOOST_THREAD_FWD_REF(Fp) f)
+          {
+            try
+            {
+              that->mark_finished_with_result(f());
+            }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+            catch(thread_interrupted& )
+            {
+              that->mark_interrupted_finish();
+            }
+#endif
+            catch(...)
+            {
+              that->mark_exceptional_finish();
+            }
+          }
+        };
+
+        //////////////////////////
+        /// future_deferred_object
+        //////////////////////////
+        template<typename Rp, typename Fp>
+        struct future_deferred_object: future_object<Rp>
+        {
+          typedef future_object<Rp> base_type;
+          Fp func_;
+
+        public:
+          explicit future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f)
+          : func_(boost::forward<Fp>(f))
+          {
+            this->set_deferred();
+          }
+
+          virtual void execute(boost::unique_lock<boost::mutex>& lck) {
+            try
+            {
+              this->mark_finished_with_result_internal(func_(), lck);
+            }
+            catch (...)
+            {
+              this->mark_exceptional_finish_internal(current_exception(), lck);
+            }
+          }
+        };
+        template<typename Rp, typename Fp>
+        struct future_deferred_object<Rp&,Fp>: future_object<Rp&>
+        {
+          typedef future_object<Rp&> base_type;
+          Fp func_;
+
+        public:
+          explicit future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f)
+          : func_(boost::forward<Fp>(f))
+          {
+            this->set_deferred();
+          }
+
+          virtual void execute(boost::unique_lock<boost::mutex>& lck) {
+            try
+            {
+              this->mark_finished_with_result_internal(func_(), lck);
+            }
+            catch (...)
+            {
+              this->mark_exceptional_finish_internal(current_exception(), lck);
+            }
+          }
+        };
+
+        template<typename Fp>
+        struct future_deferred_object<void,Fp>: future_object<void>
+        {
+          typedef future_object<void> base_type;
+          Fp func_;
+
+        public:
+          explicit future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f)
+          : func_(boost::forward<Fp>(f))
+          {
+            this->set_deferred();
+          }
+
+          virtual void execute(boost::unique_lock<boost::mutex>& lck) {
+            try
+            {
+              func_();
+              this->mark_finished_with_result_internal(lck);
+            }
+            catch (...)
+            {
+              this->mark_exceptional_finish_internal(current_exception(), lck);
+            }
+          }
+        };
+
+//        template<typename T, typename Allocator>
+//        struct future_object_alloc: public future_object<T>
+//        {
+//          typedef future_object<T> base;
+//          Allocator alloc_;
+//
+//        public:
+//          explicit future_object_alloc(const Allocator& a)
+//              : alloc_(a) {}
+//
+//        };
+        class future_waiter
+        {
+            struct registered_waiter;
+            typedef std::vector<int>::size_type count_type;
+
+            struct registered_waiter
+            {
+                boost::shared_ptr<detail::future_object_base> future_;
+                detail::future_object_base::waiter_list::iterator wait_iterator;
+                count_type index;
+
+                registered_waiter(boost::shared_ptr<detail::future_object_base> const& a_future,
+                                  detail::future_object_base::waiter_list::iterator wait_iterator_,
+                                  count_type index_):
+                    future_(a_future),wait_iterator(wait_iterator_),index(index_)
+                {}
+            };
+
+            struct all_futures_lock
+            {
+#ifdef _MANAGED
+                   typedef std::ptrdiff_t count_type_portable;
+#else
+                   typedef count_type count_type_portable;
+#endif
+                   count_type_portable count;
+                   boost::scoped_array<boost::unique_lock<boost::mutex> > locks;
 
                 all_futures_lock(std::vector<registered_waiter>& futures):
                     count(futures.size()),locks(new boost::unique_lock<boost::mutex>[count])
@@ -610,7 +1124,7 @@ namespace boost
 #if defined __DECCXX || defined __SUNPRO_CC || defined __hpux
                         locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex).move();
 #else
-                        locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex);
+                        locks[i]=boost::unique_lock<boost::mutex>(futures[i].future_->mutex); // TODO shouldn't be moved explicitly
 #endif
                     }
                 }
@@ -805,70 +1319,53 @@ namespace boost
     template <typename R>
     class packaged_task;
 
-    template <typename R>
-    class BOOST_THREAD_FUTURE
+    namespace detail
     {
-    private:
+      /// Common implementation for all the futures independently of the return type
+      class base_future
+      {
+        //BOOST_THREAD_MOVABLE(base_future)
+
+      };
+      /// Common implementation for future and shared_future.
+      template <typename R>
+      class basic_future : public base_future
+      {
+      protected:
 
         typedef boost::shared_ptr<detail::future_object<R> > future_ptr;
 
         future_ptr future_;
 
-        friend class shared_future<R>;
-        friend class promise<R>;
-        friend class packaged_task<R>;
-        friend class detail::future_waiter;
-
-        typedef typename detail::future_traits<R>::move_dest_type move_dest_type;
-
-        BOOST_THREAD_FUTURE(future_ptr a_future):
-            future_(a_future)
-        {}
+        basic_future(future_ptr a_future):
+          future_(a_future)
+        {
+        }
+        // Copy construction from a shared_future
+        explicit basic_future(const shared_future<R>&) BOOST_NOEXCEPT;
 
-    public:
-        BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE)
+      public:
         typedef future_state::state state;
 
-        BOOST_THREAD_FUTURE()
-        {}
-
-        ~BOOST_THREAD_FUTURE()
-        {}
+        BOOST_THREAD_MOVABLE(basic_future)
+        basic_future(): future_() {}
+        ~basic_future() {}
 
-        BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT:
-            future_(BOOST_THREAD_RV(other).future_)
+        basic_future(BOOST_THREAD_RV_REF(basic_future) other) BOOST_NOEXCEPT:
+        future_(BOOST_THREAD_RV(other).future_)
         {
             BOOST_THREAD_RV(other).future_.reset();
         }
-
-        BOOST_THREAD_FUTURE& operator=(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT
+        basic_future& operator=(BOOST_THREAD_RV_REF(basic_future) other) BOOST_NOEXCEPT
         {
             future_=BOOST_THREAD_RV(other).future_;
             BOOST_THREAD_RV(other).future_.reset();
             return *this;
         }
-
-        shared_future<R> share()
-        {
-          return shared_future<R>(::boost::move(*this));
-        }
-
-        void swap(BOOST_THREAD_FUTURE& other)
-        {
-            future_.swap(other.future_);
-        }
-
-        // retrieving the value
-        move_dest_type get()
+        void swap(basic_future& that) BOOST_NOEXCEPT
         {
-            if(!future_)
-            {
-                boost::throw_exception(future_uninitialized());
-            }
-
-            return future_->get();
+          future_.swap(that.future_);
         }
-
         // functions to check state, and wait for ready
         state get_state() const BOOST_NOEXCEPT
         {
@@ -894,6 +1391,12 @@ namespace boost
             return future_ && future_->has_value();
         }
 
+        launch launch_policy() const BOOST_NOEXCEPT
+        {
+            if ( future_ ) return future_->launch_policy();
+            else return launch(launch::none);
+        }
+
         bool valid() const BOOST_NOEXCEPT
         {
             return future_ != 0;
@@ -909,6 +1412,7 @@ namespace boost
             future_->wait(false);
         }
 
+#if defined BOOST_THREAD_USES_DATETIME
         template<typename Duration>
         bool timed_wait(Duration const& rel_time) const
         {
@@ -923,6 +1427,7 @@ namespace boost
             }
             return future_->timed_wait_until(abs_time);
         }
+#endif
 #ifdef BOOST_THREAD_USES_CHRONO
         template <class Rep, class Period>
         future_status
@@ -942,35 +1447,192 @@ namespace boost
           return future_->wait_until(abs_time);
         }
 #endif
+
+      };
+
+    } // detail
+    BOOST_THREAD_DCL_MOVABLE_BEG(R) detail::basic_future<R> BOOST_THREAD_DCL_MOVABLE_END
+
+    namespace detail
+    {
+#if (!defined _MSC_VER || _MSC_VER >= 1400) // _MSC_VER == 1400 on MSVC 2005
+        template <class Rp, class Fp>
+        BOOST_THREAD_FUTURE<Rp>
+        make_future_async_object(BOOST_THREAD_FWD_REF(Fp) f);
+
+        template <class Rp, class Fp>
+        BOOST_THREAD_FUTURE<Rp>
+        make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f);
+#endif // #if (!defined _MSC_VER || _MSC_VER >= 1400)
+
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+        template <class F, class Rp, class Fp>
+        BOOST_THREAD_FUTURE<Rp>
+        make_future_async_continuation(boost::unique_lock<boost::mutex> &lock, F& f, BOOST_THREAD_FWD_REF(Fp) c);
+
+        template <class F, class Rp, class Fp>
+        BOOST_THREAD_FUTURE<Rp>
+        make_future_deferred_continuation(boost::unique_lock<boost::mutex> &lock, F& f, BOOST_THREAD_FWD_REF(Fp) c);
+#endif
+
+    }
+
+    template <typename R>
+    class BOOST_THREAD_FUTURE : public detail::basic_future<R>
+    {
+    private:
+        typedef detail::basic_future<R> base_type;
+        typedef typename base_type::future_ptr future_ptr;
+
+        friend class shared_future<R>;
+        friend class promise<R>;
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+        template <typename, typename, typename>
+        friend struct detail::future_async_continuation;
+        template <typename, typename, typename>
+        friend struct detail::future_deferred_continuation;
+#endif
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+        template <class> friend class packaged_task; // todo check if this works in windows
+#else
+        friend class packaged_task<R>;
+#endif
+        friend class detail::future_waiter;
+
+        template <class Rp, class Fp>
+        friend BOOST_THREAD_FUTURE<Rp>
+        detail::make_future_async_object(BOOST_THREAD_FWD_REF(Fp) f);
+
+        template <class Rp, class Fp>
+        friend BOOST_THREAD_FUTURE<Rp>
+        detail::make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f);
+
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+        template <class F, class Rp, class Fp>
+        friend BOOST_THREAD_FUTURE<Rp>
+        detail::make_future_async_continuation(boost::unique_lock<boost::mutex> &lock, F& f, BOOST_THREAD_FWD_REF(Fp) c);
+
+        template <class F, class Rp, class Fp>
+        friend BOOST_THREAD_FUTURE<Rp>
+        detail::make_future_deferred_continuation(boost::unique_lock<boost::mutex> &lock, F& f, BOOST_THREAD_FWD_REF(Fp) c);
+#endif
+
+        typedef typename detail::future_traits<R>::move_dest_type move_dest_type;
+
+        BOOST_THREAD_FUTURE(future_ptr a_future):
+          base_type(a_future)
+        {
+        }
+
+    public:
+        BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE)
+        typedef future_state::state state;
+
+        BOOST_CONSTEXPR BOOST_THREAD_FUTURE() {}
+
+        ~BOOST_THREAD_FUTURE() {}
+
+        BOOST_THREAD_FUTURE(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT:
+        base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))))
+        {
+        }
+
+        BOOST_THREAD_FUTURE& operator=(BOOST_THREAD_RV_REF(BOOST_THREAD_FUTURE) other) BOOST_NOEXCEPT
+        {
+            this->base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))));
+            return *this;
+        }
+
+        shared_future<R> share()
+        {
+          return shared_future<R>(::boost::move(*this));
+        }
+
+        void swap(BOOST_THREAD_FUTURE& other)
+        {
+            static_cast<base_type*>(this)->swap(other);
+        }
+
+        // todo this functio�n must be private and friendship provided to the internal users.
+        void set_async()
+        {
+          this->future_->set_async();
+        }
+        // todo this functio�n must be private and friendship provided to the internal users.
+        void set_deferred()
+        {
+          this->future_->set_deferred();
+        }
+
+        // retrieving the value
+        move_dest_type get()
+        {
+            if(!this->future_)
+            {
+                boost::throw_exception(future_uninitialized());
+            }
+#ifdef BOOST_THREAD_PROVIDES_FUTURE_INVALID_AFTER_GET
+            future_ptr fut_=this->future_;
+            this->future_.reset();
+            return fut_->get();
+
+#else
+            return this->future_->get();
+#endif
+        }
+
+
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+
+//        template<typename F>
+//        auto then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>;
+
+//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+//        template<typename RF>
+//        inline BOOST_THREAD_FUTURE<RF> then(RF(*func)(BOOST_THREAD_FUTURE&));
+//        template<typename RF>
+//        inline BOOST_THREAD_FUTURE<RF> then(launch policy, RF(*func)(BOOST_THREAD_FUTURE&));
+//#endif
+        template<typename F>
+        inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE&)>::type>
+        then(BOOST_THREAD_FWD_REF(F) func);
+        template<typename F>
+        inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE&)>::type>
+        then(launch policy, BOOST_THREAD_FWD_REF(F) func);
+#endif
     };
 
     BOOST_THREAD_DCL_MOVABLE_BEG(T) BOOST_THREAD_FUTURE<T> BOOST_THREAD_DCL_MOVABLE_END
 
     template <typename R>
-    class shared_future
+    class shared_future : public detail::basic_future<R>
     {
-        typedef boost::shared_ptr<detail::future_object<R> > future_ptr;
 
-        future_ptr future_;
+        typedef detail::basic_future<R> base_type;
+        typedef typename base_type::future_ptr future_ptr;
 
         friend class detail::future_waiter;
         friend class promise<R>;
-        friend class packaged_task<R>;
 
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+        template <class> friend class packaged_task;// todo check if this works in windows
+#else
+        friend class packaged_task<R>;
+#endif
         shared_future(future_ptr a_future):
-            future_(a_future)
+          base_type(a_future)
         {}
 
     public:
         BOOST_THREAD_MOVABLE(shared_future)
 
         shared_future(shared_future const& other):
-            future_(other.future_)
+        base_type(other)
         {}
 
         typedef future_state::state state;
 
-        shared_future()
+        BOOST_CONSTEXPR shared_future()
         {}
 
         ~shared_future()
@@ -978,141 +1640,250 @@ namespace boost
 
         shared_future& operator=(shared_future const& other)
         {
-            future_=other.future_;
+            shared_future(other).swap(*this);
             return *this;
         }
         shared_future(BOOST_THREAD_RV_REF(shared_future) other) BOOST_NOEXCEPT :
-            future_(BOOST_THREAD_RV(other).future_)
+        base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))))
         {
             BOOST_THREAD_RV(other).future_.reset();
         }
-        shared_future(BOOST_THREAD_RV_REF_BEG BOOST_THREAD_FUTURE<R> BOOST_THREAD_RV_REF_END other) BOOST_NOEXCEPT :
-            future_(BOOST_THREAD_RV(other).future_)
+        shared_future(BOOST_THREAD_RV_REF( BOOST_THREAD_FUTURE<R> ) other) BOOST_NOEXCEPT :
+        base_type(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))))
         {
-            BOOST_THREAD_RV(other).future_.reset();
         }
+
         shared_future& operator=(BOOST_THREAD_RV_REF(shared_future) other) BOOST_NOEXCEPT
         {
-            future_.swap(BOOST_THREAD_RV(other).future_);
-            BOOST_THREAD_RV(other).future_.reset();
+            base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))));
             return *this;
         }
-        shared_future& operator=(BOOST_THREAD_RV_REF_BEG BOOST_THREAD_FUTURE<R> BOOST_THREAD_RV_REF_END other) BOOST_NOEXCEPT
+        shared_future& operator=(BOOST_THREAD_RV_REF( BOOST_THREAD_FUTURE<R> ) other) BOOST_NOEXCEPT
         {
-            future_.swap(BOOST_THREAD_RV(other).future_);
-            BOOST_THREAD_RV(other).future_.reset();
+            base_type::operator=(boost::move(static_cast<base_type&>(BOOST_THREAD_RV(other))));
+            //shared_future(boost::move(other)).swap(*this);
+            //this->future_.swap(BOOST_THREAD_RV(other).future_);
+            //BOOST_THREAD_RV(other).future_.reset();
             return *this;
         }
 
         void swap(shared_future& other) BOOST_NOEXCEPT
         {
-            future_.swap(other.future_);
+            static_cast<base_type*>(this)->swap(other);
         }
 
         // retrieving the value
         typename detail::future_object<R>::shared_future_get_result_type get()
         {
-            if(!future_)
+            if(!this->future_)
             {
                 boost::throw_exception(future_uninitialized());
             }
 
-            return future_->get_sh();
+            return this->future_->get_sh();
         }
 
-        // functions to check state, and wait for ready
-        state get_state() const  BOOST_NOEXCEPT
+    };
+
+    BOOST_THREAD_DCL_MOVABLE_BEG(T) shared_future<T> BOOST_THREAD_DCL_MOVABLE_END
+
+    namespace detail
+    {
+      /// Copy construction from a shared_future
+      template <typename R>
+      inline basic_future<R>::basic_future(const shared_future<R>& other) BOOST_NOEXCEPT
+      : future_(other.future_)
+      {
+      }
+    }
+
+    template <typename R>
+    class promise
+    {
+        typedef boost::shared_ptr<detail::future_object<R> > future_ptr;
+
+        future_ptr future_;
+        bool future_obtained;
+
+        void lazy_init()
         {
-            if(!future_)
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
+#include <boost/detail/atomic_undef_macros.hpp>
+          if(!atomic_load(&future_))
             {
-                return future_state::uninitialized;
+                future_ptr blank;
+                atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R>));
             }
-            return future_->get_state();
+#include <boost/detail/atomic_redef_macros.hpp>
+#endif
         }
 
-        bool valid() const  BOOST_NOEXCEPT
+    public:
+        BOOST_THREAD_MOVABLE_ONLY(promise)
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
+        template <class Allocator>
+        promise(boost::allocator_arg_t, Allocator a)
         {
-            return future_ != 0;
+          typedef typename Allocator::template rebind<detail::future_object<R> >::other A2;
+          A2 a2(a);
+          typedef thread_detail::allocator_destructor<A2> D;
+
+          future_ = future_ptr(::new(a2.allocate(1)) detail::future_object<R>(), D(a2, 1) );
+          future_obtained = false;
         }
+#endif
+        promise():
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
+            future_(),
+#else
+            future_(new detail::future_object<R>()),
+#endif
+            future_obtained(false)
+        {}
 
-        bool is_ready() const  BOOST_NOEXCEPT
+        ~promise()
         {
-            return get_state()==future_state::ready;
+            if(future_)
+            {
+                boost::unique_lock<boost::mutex> lock(future_->mutex);
+
+                if(!future_->done && !future_->is_constructed)
+                {
+                    future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock);
+                }
+            }
         }
 
-        bool has_exception() const BOOST_NOEXCEPT
+        // Assignment
+        promise(BOOST_THREAD_RV_REF(promise) rhs) BOOST_NOEXCEPT :
+            future_(BOOST_THREAD_RV(rhs).future_),future_obtained(BOOST_THREAD_RV(rhs).future_obtained)
         {
-            return future_ && future_->has_exception();
+            BOOST_THREAD_RV(rhs).future_.reset();
+            BOOST_THREAD_RV(rhs).future_obtained=false;
+        }
+        promise & operator=(BOOST_THREAD_RV_REF(promise) rhs) BOOST_NOEXCEPT
+        {
+            future_=BOOST_THREAD_RV(rhs).future_;
+            future_obtained=BOOST_THREAD_RV(rhs).future_obtained;
+            BOOST_THREAD_RV(rhs).future_.reset();
+            BOOST_THREAD_RV(rhs).future_obtained=false;
+            return *this;
         }
 
-        bool has_value() const BOOST_NOEXCEPT
+        void swap(promise& other)
         {
-            return future_ && future_->has_value();
+            future_.swap(other.future_);
+            std::swap(future_obtained,other.future_obtained);
         }
 
-        void wait() const
+        // Result retrieval
+        BOOST_THREAD_FUTURE<R> get_future()
         {
-            if(!future_)
+            lazy_init();
+            if (future_.get()==0)
             {
-                boost::throw_exception(future_uninitialized());
+                boost::throw_exception(promise_moved());
             }
-            future_->wait(false);
+            if (future_obtained)
+            {
+                boost::throw_exception(future_already_retrieved());
+            }
+            future_obtained=true;
+            return BOOST_THREAD_FUTURE<R>(future_);
         }
 
-        template<typename Duration>
-        bool timed_wait(Duration const& rel_time) const
+        void set_value(typename detail::future_traits<R>::source_reference_type r)
         {
-            return timed_wait_until(boost::get_system_time()+rel_time);
+            lazy_init();
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
+            if(future_->done)
+            {
+                boost::throw_exception(promise_already_satisfied());
+            }
+            future_->mark_finished_with_result_internal(r, lock);
         }
 
-        bool timed_wait_until(boost::system_time const& abs_time) const
+//         void set_value(R && r);
+        void set_value(typename detail::future_traits<R>::rvalue_source_type r)
         {
-            if(!future_)
+            lazy_init();
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
+            if(future_->done)
             {
-                boost::throw_exception(future_uninitialized());
+                boost::throw_exception(promise_already_satisfied());
             }
-            return future_->timed_wait_until(abs_time);
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+            future_->mark_finished_with_result_internal(boost::forward<R>(r), lock);
+#else
+            future_->mark_finished_with_result_internal(static_cast<typename detail::future_traits<R>::rvalue_source_type>(r), lock);
+#endif
         }
-#ifdef BOOST_THREAD_USES_CHRONO
 
-        template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const
+        void set_exception(boost::exception_ptr p)
         {
-          return wait_until(chrono::steady_clock::now() + rel_time);
+            lazy_init();
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
+            if(future_->done)
+            {
+                boost::throw_exception(promise_already_satisfied());
+            }
+            future_->mark_exceptional_finish_internal(p, lock);
+        }
 
+        // setting the result with deferred notification
+        void set_value_at_thread_exit(const R& r)
+        {
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_value_at_thread_exit(r);
         }
-        template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const
+
+        void set_value_at_thread_exit(BOOST_THREAD_RV_REF(R) r)
         {
-          if(!future_)
+          if (future_.get()==0)
           {
-              boost::throw_exception(future_uninitialized());
+              boost::throw_exception(promise_moved());
           }
-          return future_->wait_until(abs_time);
+          future_->set_value_at_thread_exit(boost::move(r));
+        }
+        void set_exception_at_thread_exit(exception_ptr e)
+        {
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_exception_at_thread_exit(e);
         }
-#endif
-    };
 
-    BOOST_THREAD_DCL_MOVABLE_BEG(T) shared_future<T> BOOST_THREAD_DCL_MOVABLE_END
+        template<typename F>
+        void set_wait_callback(F f)
+        {
+            lazy_init();
+            future_->set_wait_callback(f,this);
+        }
+
+    };
 
     template <typename R>
-    class promise
+    class promise<R&>
     {
-        typedef boost::shared_ptr<detail::future_object<R> > future_ptr;
+        typedef boost::shared_ptr<detail::future_object<R&> > future_ptr;
 
         future_ptr future_;
         bool future_obtained;
 
         void lazy_init()
         {
-#if defined BOOST_THREAD_PROMISE_LAZY
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
+#include <boost/detail/atomic_undef_macros.hpp>
             if(!atomic_load(&future_))
             {
                 future_ptr blank;
-                atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R>));
+                atomic_compare_exchange(&future_,&blank,future_ptr(new detail::future_object<R&>));
             }
+#include <boost/detail/atomic_redef_macros.hpp>
 #endif
         }
 
@@ -1122,19 +1893,19 @@ namespace boost
         template <class Allocator>
         promise(boost::allocator_arg_t, Allocator a)
         {
-          typedef typename Allocator::template rebind<detail::future_object<R> >::other A2;
+          typedef typename Allocator::template rebind<detail::future_object<R&> >::other A2;
           A2 a2(a);
           typedef thread_detail::allocator_destructor<A2> D;
 
-          future_ = future_ptr(::new(a2.allocate(1)) detail::future_object<R>(), D(a2, 1) );
+          future_ = future_ptr(::new(a2.allocate(1)) detail::future_object<R&>(), D(a2, 1) );
           future_obtained = false;
         }
 #endif
         promise():
-#if defined BOOST_THREAD_PROMISE_LAZY
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
             future_(),
 #else
-            future_(new detail::future_object<R>()),
+            future_(new detail::future_object<R&>()),
 #endif
             future_obtained(false)
         {}
@@ -1143,11 +1914,11 @@ namespace boost
         {
             if(future_)
             {
-                boost::lock_guard<boost::mutex> lock(future_->mutex);
+                boost::unique_lock<boost::mutex> lock(future_->mutex);
 
-                if(!future_->done)
+                if(!future_->done && !future_->is_constructed)
                 {
-                    future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()));
+                    future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock);
                 }
             }
         }
@@ -1175,7 +1946,7 @@ namespace boost
         }
 
         // Result retrieval
-        BOOST_THREAD_FUTURE<R> get_future()
+        BOOST_THREAD_FUTURE<R&> get_future()
         {
             lazy_init();
             if (future_.get()==0)
@@ -1187,47 +1958,49 @@ namespace boost
                 boost::throw_exception(future_already_retrieved());
             }
             future_obtained=true;
-            return BOOST_THREAD_FUTURE<R>(future_);
+            return BOOST_THREAD_FUTURE<R&>(future_);
         }
 
-        void set_value(typename detail::future_traits<R>::source_reference_type r)
+        void set_value(R& r)
         {
             lazy_init();
-            boost::lock_guard<boost::mutex> lock(future_->mutex);
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
             if(future_->done)
             {
                 boost::throw_exception(promise_already_satisfied());
             }
-            future_->mark_finished_with_result_internal(r);
+            future_->mark_finished_with_result_internal(r, lock);
         }
 
-//         void set_value(R && r);
-        void set_value(typename detail::future_traits<R>::rvalue_source_type r)
+        void set_exception(boost::exception_ptr p)
         {
             lazy_init();
-            boost::lock_guard<boost::mutex> lock(future_->mutex);
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
             if(future_->done)
             {
                 boost::throw_exception(promise_already_satisfied());
             }
-            future_->mark_finished_with_result_internal(static_cast<typename detail::future_traits<R>::rvalue_source_type>(r));
+            future_->mark_exceptional_finish_internal(p, lock);
         }
 
-        void set_exception(boost::exception_ptr p)
+        // setting the result with deferred notification
+        void set_value_at_thread_exit(R& r)
         {
-            lazy_init();
-            boost::lock_guard<boost::mutex> lock(future_->mutex);
-            if(future_->done)
-            {
-                boost::throw_exception(promise_already_satisfied());
-            }
-            future_->mark_exceptional_finish_internal(p);
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_value_at_thread_exit(r);
         }
 
-        // setting the result with deferred notification
-        //void set_value_at_thread_exit(const R& r); // NOT YET IMPLEMENTED
-        //void set_value_at_thread_exit(see below); // NOT YET IMPLEMENTED
-        //void set_exception_at_thread_exit(exception_ptr p); // NOT YET IMPLEMENTED
+        void set_exception_at_thread_exit(exception_ptr e)
+        {
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_exception_at_thread_exit(e);
+        }
 
         template<typename F>
         void set_wait_callback(F f)
@@ -1237,7 +2010,6 @@ namespace boost
         }
 
     };
-
     template <>
     class promise<void>
     {
@@ -1248,7 +2020,7 @@ namespace boost
 
         void lazy_init()
         {
-#if defined BOOST_THREAD_PROMISE_LAZY
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
             if(!atomic_load(&future_))
             {
                 future_ptr blank;
@@ -1272,7 +2044,7 @@ namespace boost
         }
 #endif
         promise():
-#if defined BOOST_THREAD_PROMISE_LAZY
+#if defined BOOST_THREAD_PROVIDES_PROMISE_LAZY
             future_(),
 #else
             future_(new detail::future_object<void>),
@@ -1284,11 +2056,11 @@ namespace boost
         {
             if(future_)
             {
-                boost::lock_guard<boost::mutex> lock(future_->mutex);
+                boost::unique_lock<boost::mutex> lock(future_->mutex);
 
-                if(!future_->done)
+                if(!future_->done && !future_->is_constructed)
                 {
-                    future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()));
+                    future_->mark_exceptional_finish_internal(boost::copy_exception(broken_promise()), lock);
                 }
             }
         }
@@ -1337,23 +2109,42 @@ namespace boost
         void set_value()
         {
             lazy_init();
-            boost::lock_guard<boost::mutex> lock(future_->mutex);
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
             if(future_->done)
             {
                 boost::throw_exception(promise_already_satisfied());
             }
-            future_->mark_finished_with_result_internal();
+            future_->mark_finished_with_result_internal(lock);
         }
 
         void set_exception(boost::exception_ptr p)
         {
             lazy_init();
-            boost::lock_guard<boost::mutex> lock(future_->mutex);
+            boost::unique_lock<boost::mutex> lock(future_->mutex);
             if(future_->done)
             {
                 boost::throw_exception(promise_already_satisfied());
             }
-            future_->mark_exceptional_finish_internal(p);
+            future_->mark_exceptional_finish_internal(p,lock);
+        }
+
+        // setting the result with deferred notification
+        void set_value_at_thread_exit()
+        {
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_value_at_thread_exit();
+        }
+
+        void set_exception_at_thread_exit(exception_ptr e)
+        {
+          if (future_.get()==0)
+          {
+              boost::throw_exception(promise_moved());
+          }
+          future_->set_exception_at_thread_exit(e);
         }
 
         template<typename F>
@@ -1379,8 +2170,20 @@ namespace boost
 
     namespace detail
     {
-        template<typename R>
-        struct task_base:
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+      template<typename R>
+      struct task_base;
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+      template<typename R, typename ...ArgTypes>
+      struct task_base<R(ArgTypes...)>:
+#else
+      template<typename R>
+      struct task_base<R()>:
+#endif
+#else
+      template<typename R>
+      struct task_base:
+#endif
             detail::future_object<R>
         {
             bool started;
@@ -1393,7 +2196,13 @@ namespace boost
             {
               started=false;
             }
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            virtual void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)=0;
+            void run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+#else
+            virtual void do_run()=0;
             void run()
+#endif
             {
                 {
                     boost::lock_guard<boost::mutex> lk(this->mutex);
@@ -1403,29 +2212,65 @@ namespace boost
                     }
                     started=true;
                 }
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                do_run(boost::forward<ArgTypes>(args)...);
+#else
                 do_run();
+#endif
+            }
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            virtual void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)=0;
+            void apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+#else
+            virtual void do_apply()=0;
+            void apply()
+#endif
+            {
+                {
+                    boost::lock_guard<boost::mutex> lk(this->mutex);
+                    if(started)
+                    {
+                        boost::throw_exception(task_already_started());
+                    }
+                    started=true;
+                }
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                do_apply(boost::forward<ArgTypes>(args)...);
+#else
+                do_apply();
+#endif
             }
 
             void owner_destroyed()
             {
-                boost::lock_guard<boost::mutex> lk(this->mutex);
+                boost::unique_lock<boost::mutex> lk(this->mutex);
                 if(!started)
                 {
                     started=true;
-                    this->mark_exceptional_finish_internal(boost::copy_exception(boost::broken_promise()));
+                    this->mark_exceptional_finish_internal(boost::copy_exception(boost::broken_promise()), lk);
                 }
             }
 
-
-            virtual void do_run()=0;
         };
 
-
-
-
-        template<typename R,typename F>
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+        template<typename F, typename R>
+        struct task_object;
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename F, typename R, typename ...ArgTypes>
+        struct task_object<F, R(ArgTypes...)>:
+          task_base<R(ArgTypes...)>
+#else
+        template<typename F, typename R>
+        struct task_object<F, R()>:
+          task_base<R()>
+#endif
+#else
+        template<typename F, typename R>
         struct task_object:
             task_base<R>
+#endif
         {
         private:
           task_object(task_object&);
@@ -1434,25 +2279,63 @@ namespace boost
             task_object(F const& f_):
                 f(f_)
             {}
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
             task_object(BOOST_THREAD_RV_REF(F) f_):
-              f(boost::forward<F>(f_))
+              f(boost::move(f_))
             {}
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...));
+                }
 #else
-            task_object(BOOST_THREAD_RV_REF(F) f_):
-                f(boost::move(f_))
-            {}
+            void do_apply()
+            {
+                try
+                {
+                    this->set_value_at_thread_exit(f());
+                }
 #endif
-            void do_run()
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                catch(thread_interrupted& )
+                {
+                    this->set_interrupted_at_thread_exit();
+                }
+#endif
+                catch(...)
+                {
+                    this->set_exception_at_thread_exit(current_exception());
+                }
+            }
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
             {
                 try
                 {
-                    this->mark_finished_with_result(f());
+                    this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...));
                 }
+#else
+            void do_run()
+            {
+                try
+                {
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+                  R res((f()));
+                  this->mark_finished_with_result(boost::move(res));
+#else
+                  this->mark_finished_with_result(f());
+#endif
+                  }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                 catch(thread_interrupted& )
                 {
                     this->mark_interrupted_finish();
                 }
+#endif
                 catch(...)
                 {
                     this->mark_exceptional_finish();
@@ -1460,37 +2343,269 @@ namespace boost
             }
         };
 
-            template<typename R>
-            struct task_object<R,R (*)()>:
-                task_base<R>
-            {
-            private:
-              task_object(task_object&);
-            public:
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename F, typename R, typename ...ArgTypes>
+        struct task_object<F, R&(ArgTypes...)>:
+          task_base<R&(ArgTypes...)>
+#else
+        template<typename F, typename R>
+        struct task_object<F, R&()>:
+          task_base<R&()>
+#endif
+#else
+        template<typename F, typename R>
+        struct task_object<F,R&>:
+            task_base<R&>
+#endif
+        {
+        private:
+          task_object(task_object&);
+        public:
+            F f;
+            task_object(F const& f_):
+                f(f_)
+            {}
+            task_object(BOOST_THREAD_RV_REF(F) f_):
+                f(boost::move(f_))
+            {}
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...));
+                }
+#else
+            void do_apply()
+            {
+                try
+                {
+                    this->set_value_at_thread_exit(f());
+                }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                catch(thread_interrupted& )
+                {
+                    this->set_interrupted_at_thread_exit();
+                }
+#endif
+                catch(...)
+                {
+                    this->set_exception_at_thread_exit(current_exception());
+                }
+            }
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...));
+                }
+#else
+            void do_run()
+            {
+                try
+                {
+                  R& res((f()));
+                  this->mark_finished_with_result(res);
+                }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                catch(thread_interrupted& )
+                {
+                    this->mark_interrupted_finish();
+                }
+#endif
+                catch(...)
+                {
+                    this->mark_exceptional_finish();
+                }
+            }
+        };
+
+#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename R, typename ...ArgTypes>
+        struct task_object<R (*)(ArgTypes...), R(ArgTypes...)>:
+          task_base<R(ArgTypes...)>
+#else
+        template<typename R>
+        struct task_object<R (*)(), R()>:
+          task_base<R()>
+#endif
+#else
+        template<typename R>
+        struct task_object<R (*)(), R> :
+           task_base<R>
+#endif
+            {
+            private:
+              task_object(task_object&);
+            public:
                 R (*f)();
                 task_object(R (*f_)()):
                     f(f_)
                 {}
+
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+                {
+                    try
+                    {
+                        this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...));
+                    }
+#else
+                void do_apply()
+                {
+                    try
+                    {
+                        R r((f()));
+                        this->set_value_at_thread_exit(boost::move(r));
+                    }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    catch(thread_interrupted& )
+                    {
+                        this->set_interrupted_at_thread_exit();
+                    }
+#endif
+                    catch(...)
+                    {
+                        this->set_exception_at_thread_exit(current_exception());
+                    }
+                }
+
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+                {
+                    try
+                    {
+                        this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...));
+                    }
+#else
                 void do_run()
                 {
                     try
                     {
-                        this->mark_finished_with_result(f());
+                        R res((f()));
+                        this->mark_finished_with_result(boost::move(res));
                     }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                     catch(thread_interrupted& )
                     {
                         this->mark_interrupted_finish();
                     }
+#endif
                     catch(...)
                     {
                         this->mark_exceptional_finish();
                     }
                 }
             };
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename R, typename ...ArgTypes>
+        struct task_object<R& (*)(ArgTypes...), R&(ArgTypes...)>:
+          task_base<R&(ArgTypes...)>
+#else
+        template<typename R>
+        struct task_object<R& (*)(), R&()>:
+          task_base<R&()>
+#endif
+#else
+        template<typename R>
+        struct task_object<R& (*)(), R&> :
+           task_base<R&>
+#endif
+            {
+            private:
+              task_object(task_object&);
+            public:
+                R& (*f)();
+                task_object(R& (*f_)()):
+                    f(f_)
+                {}
+
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+                {
+                    try
+                    {
+                        this->set_value_at_thread_exit(f(boost::forward<ArgTypes>(args)...));
+                    }
+#else
+                void do_apply()
+                {
+                    try
+                    {
+                      this->set_value_at_thread_exit(f());
+                    }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    catch(thread_interrupted& )
+                    {
+                        this->set_interrupted_at_thread_exit();
+                    }
+#endif
+                    catch(...)
+                    {
+                        this->set_exception_at_thread_exit(current_exception());
+                    }
+                }
+
 
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+                void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+                {
+                    try
+                    {
+                        this->mark_finished_with_result(f(boost::forward<ArgTypes>(args)...));
+                    }
+#else
+                void do_run()
+                {
+                    try
+                    {
+                        this->mark_finished_with_result(f());
+                    }
+#endif
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                    catch(thread_interrupted& )
+                    {
+                        this->mark_interrupted_finish();
+                    }
+#endif
+                    catch(...)
+                    {
+                        this->mark_exceptional_finish();
+                    }
+                }
+            };
+#endif
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename F, typename ...ArgTypes>
+        struct task_object<F, void(ArgTypes...)>:
+          task_base<void(ArgTypes...)>
+#else
+        template<typename F>
+        struct task_object<F, void()>:
+          task_base<void()>
+#endif
+#else
         template<typename F>
-        struct task_object<void,F>:
-            task_base<void>
+        struct task_object<F,void>:
+          task_base<void>
+#endif
         {
         private:
           task_object(task_object&);
@@ -1499,27 +2614,58 @@ namespace boost
             task_object(F const& f_):
                 f(f_)
             {}
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-            task_object(BOOST_THREAD_RV_REF(F) f_):
-              f(boost::forward<F>(f_))
-            {}
-#else
             task_object(BOOST_THREAD_RV_REF(F) f_):
                 f(boost::move(f_))
             {}
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+              try
+              {
+                f(boost::forward<ArgTypes>(args)...);
+#else
+            void do_apply()
+            {
+                try
+                {
+                    f();
+#endif
+                  this->set_value_at_thread_exit();
+                }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                catch(thread_interrupted& )
+                {
+                    this->set_interrupted_at_thread_exit();
+                }
 #endif
+                catch(...)
+                {
+                    this->set_exception_at_thread_exit(current_exception());
+                }
+            }
 
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    f(boost::forward<ArgTypes>(args)...);
+#else
             void do_run()
             {
                 try
                 {
                     f();
+#endif
                     this->mark_finished_with_result();
                 }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                 catch(thread_interrupted& )
                 {
                     this->mark_interrupted_finish();
                 }
+#endif
                 catch(...)
                 {
                     this->mark_exceptional_finish();
@@ -1527,9 +2673,21 @@ namespace boost
             }
         };
 
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template<typename ...ArgTypes>
+        struct task_object<void (*)(ArgTypes...), void(ArgTypes...)>:
+        task_base<void(ArgTypes...)>
+#else
+        template<>
+        struct task_object<void (*)(), void()>:
+        task_base<void()>
+#endif
+#else
         template<>
-        struct task_object<void,void (*)()>:
-            task_base<void>
+        struct task_object<void (*)(),void>:
+          task_base<void>
+#endif
         {
         private:
           task_object(task_object&);
@@ -1538,17 +2696,55 @@ namespace boost
             task_object(void (*f_)()):
                 f(f_)
             {}
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_apply(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    f(boost::forward<ArgTypes>(args)...);
+#else
+            void do_apply()
+            {
+                try
+                {
+                    f();
+#endif
+                    this->set_value_at_thread_exit();
+                }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+                catch(thread_interrupted& )
+                {
+                    this->set_interrupted_at_thread_exit();
+                }
+#endif
+                catch(...)
+                {
+                    this->set_exception_at_thread_exit(current_exception());
+                }
+            }
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            void do_run(BOOST_THREAD_RV_REF(ArgTypes) ... args)
+            {
+                try
+                {
+                    f(boost::forward<ArgTypes>(args)...);
+#else
             void do_run()
             {
                 try
                 {
                   f();
+#endif
                   this->mark_finished_with_result();
                 }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
                 catch(thread_interrupted& )
                 {
                     this->mark_interrupted_finish();
                 }
+#endif
                 catch(...)
                 {
                     this->mark_exceptional_finish();
@@ -1558,12 +2754,30 @@ namespace boost
 
     }
 
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+    template<typename R, typename ...ArgTypes>
+    class packaged_task<R(ArgTypes...)>
+    {
+      typedef boost::shared_ptr<detail::task_base<R(ArgTypes...)> > task_ptr;
+      boost::shared_ptr<detail::task_base<R(ArgTypes...)> > task;
+  #else
+    template<typename R>
+    class packaged_task<R()>
+    {
+      typedef boost::shared_ptr<detail::task_base<R()> > task_ptr;
+      boost::shared_ptr<detail::task_base<R()> > task;
+  #endif
+#else
     template<typename R>
     class packaged_task
     {
-        typedef boost::shared_ptr<detail::task_base<R> > task_ptr;
-        boost::shared_ptr<detail::task_base<R> > task;
+      typedef boost::shared_ptr<detail::task_base<R> > task_ptr;
+      boost::shared_ptr<detail::task_base<R> > task;
+#endif
         bool future_obtained;
+        struct dummy;
 
     public:
         typedef R result_type;
@@ -1574,73 +2788,184 @@ namespace boost
         {}
 
         // construction and destruction
+#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
 
-        explicit packaged_task(R(*f)()):
-            task(new detail::task_object<R,R(*)()>(f)),future_obtained(false)
-        {}
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        template <class F>
-        explicit packaged_task(BOOST_THREAD_RV_REF(F) f):
-            task(new detail::task_object<R,
-                typename remove_cv<typename remove_reference<F>::type>::type
-                >(boost::forward<F>(f))),future_obtained(false)
-        {}
-#else
-        template <class F>
-        explicit packaged_task(F const& f):
-            task(new detail::task_object<R,F>(f)),future_obtained(false)
-        {}
-        template <class F>
-        explicit packaged_task(BOOST_THREAD_RV_REF(F) f):
-            task(new detail::task_object<R,F>(boost::move(f))),future_obtained(false)
-        {}
-#endif
-
-#if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
-        template <class Allocator>
-        packaged_task(boost::allocator_arg_t, Allocator a, R(*f)())
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        explicit packaged_task(R(*f)(), BOOST_THREAD_FWD_REF(ArgTypes)... args)
         {
-          typedef R(*FR)();
-          typedef typename Allocator::template rebind<detail::task_object<R,FR> >::other A2;
-          A2 a2(a);
-          typedef thread_detail::allocator_destructor<A2> D;
-
-          task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,FR>(f), D(a2, 1) );
-          future_obtained = false;
+            typedef R(*FR)(BOOST_THREAD_FWD_REF(ArgTypes)...);
+            typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
+            task= task_ptr(new task_object_type(f, boost::forward<ArgTypes>(args)...));
+            future_obtained=false;
         }
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-        template <class F, class Allocator>
-        packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_RV_REF(F) f)
+  #else
+        explicit packaged_task(R(*f)())
         {
-          typedef typename remove_cv<typename remove_reference<F>::type>::type FR;
-          typedef typename Allocator::template rebind<detail::task_object<R,FR> >::other A2;
-          A2 a2(a);
-          typedef thread_detail::allocator_destructor<A2> D;
-
-          task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,FR>(boost::forward<F>(f)), D(a2, 1) );
-          future_obtained = false;
+            typedef R(*FR)();
+            typedef detail::task_object<FR,R()> task_object_type;
+            task= task_ptr(new task_object_type(f));
+            future_obtained=false;
         }
+  #endif
 #else
-        template <class F, class Allocator>
-        packaged_task(boost::allocator_arg_t, Allocator a, const F& f)
+        explicit packaged_task(R(*f)())
         {
-          typedef typename Allocator::template rebind<detail::task_object<R,F> >::other A2;
+              typedef R(*FR)();
+            typedef detail::task_object<FR,R> task_object_type;
+            task= task_ptr(new task_object_type(f));
+            future_obtained=false;
+        }
+#endif
+#endif
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+        template <class F>
+        explicit packaged_task(BOOST_THREAD_FWD_REF(F) f
+            , typename disable_if<is_same<typename decay<F>::type, packaged_task>, dummy* >::type=0
+            )
+        {
+          typedef typename remove_cv<typename remove_reference<F>::type>::type FR;
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
+  #else
+            typedef detail::task_object<FR,R()> task_object_type;
+  #endif
+#else
+            typedef detail::task_object<FR,R> task_object_type;
+#endif
+            task = task_ptr(new task_object_type(boost::forward<F>(f)));
+            future_obtained = false;
+
+        }
+
+#else
+        template <class F>
+        explicit packaged_task(F const& f
+            , typename disable_if<is_same<typename decay<F>::type, packaged_task>, dummy* >::type=0
+            )
+        {
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            typedef detail::task_object<F,R(ArgTypes...)> task_object_type;
+  #else
+            typedef detail::task_object<F,R()> task_object_type;
+  #endif
+#else
+            typedef detail::task_object<F,R> task_object_type;
+#endif
+            task = task_ptr(new task_object_type(f));
+            future_obtained=false;
+        }
+        template <class F>
+        explicit packaged_task(BOOST_THREAD_RV_REF(F) f)
+        {
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+#if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            typedef detail::task_object<F,R(ArgTypes...)> task_object_type;
+            task = task_ptr(new task_object_type(boost::forward<F>(f)));
+#else
+            typedef detail::task_object<F,R()> task_object_type;
+            task = task_ptr(new task_object_type(boost::move<F>(f))); // TODO forward
+#endif
+#else
+            typedef detail::task_object<F,R> task_object_type;
+            task = task_ptr(new task_object_type(boost::forward<F>(f)));
+#endif
+            future_obtained=false;
+
+        }
+#endif
+
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
+#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+        template <class Allocator>
+        packaged_task(boost::allocator_arg_t, Allocator a, R(*f)())
+        {
+          typedef R(*FR)();
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
+  #else
+          typedef detail::task_object<FR,R()> task_object_type;
+  #endif
+#else
+          typedef detail::task_object<FR,R> task_object_type;
+#endif
+          typedef typename Allocator::template rebind<task_object_type>::other A2;
+          A2 a2(a);
+          typedef thread_detail::allocator_destructor<A2> D;
+
+          task = task_ptr(::new(a2.allocate(1)) task_object_type(f), D(a2, 1) );
+          future_obtained = false;
+        }
+#endif // BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
+
+#if ! defined BOOST_NO_CXX11_RVALUE_REFERENCES
+        template <class F, class Allocator>
+        packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_FWD_REF(F) f)
+        {
+          typedef typename remove_cv<typename remove_reference<F>::type>::type FR;
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          typedef detail::task_object<FR,R(ArgTypes...)> task_object_type;
+  #else
+          typedef detail::task_object<FR,R()> task_object_type;
+  #endif
+#else
+          typedef detail::task_object<FR,R> task_object_type;
+#endif
+          typedef typename Allocator::template rebind<task_object_type>::other A2;
           A2 a2(a);
           typedef thread_detail::allocator_destructor<A2> D;
 
-          task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,F>(f), D(a2, 1) );
+          task = task_ptr(::new(a2.allocate(1)) task_object_type(boost::forward<F>(f)), D(a2, 1) );
+          future_obtained = false;
+        }
+#else // ! defined BOOST_NO_CXX11_RVALUE_REFERENCES
+        template <class F, class Allocator>
+        packaged_task(boost::allocator_arg_t, Allocator a, const F& f)
+        {
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          typedef detail::task_object<F,R(ArgTypes...)> task_object_type;
+  #else
+          typedef detail::task_object<F,R()> task_object_type;
+  #endif
+#else
+          typedef detail::task_object<F,R> task_object_type;
+#endif
+          typedef typename Allocator::template rebind<task_object_type>::other A2;
+          A2 a2(a);
+          typedef thread_detail::allocator_destructor<A2> D;
+
+          task = task_ptr(::new(a2.allocate(1)) task_object_type(f), D(a2, 1) );
           future_obtained = false;
         }
         template <class F, class Allocator>
         packaged_task(boost::allocator_arg_t, Allocator a, BOOST_THREAD_RV_REF(F) f)
         {
-          typedef typename Allocator::template rebind<detail::task_object<R,F> >::other A2;
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          typedef detail::task_object<F,R(ArgTypes...)> task_object_type;
+  #else
+          typedef detail::task_object<F,R()> task_object_type;
+  #endif
+#else
+          typedef detail::task_object<F,R> task_object_type;
+#endif
+          typedef typename Allocator::template rebind<task_object_type>::other A2;
           A2 a2(a);
           typedef thread_detail::allocator_destructor<A2> D;
 
-          task = task_ptr(::new(a2.allocate(1)) detail::task_object<R,F>(boost::move(f)), D(a2, 1) );
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          task = task_ptr(::new(a2.allocate(1)) task_object_type(boost::forward<F>(f)), D(a2, 1) );
+#else
+          task = task_ptr(::new(a2.allocate(1)) task_object_type(boost::move(f)), D(a2, 1) );  // TODO forward
+#endif
           future_obtained = false;
         }
+
 #endif //BOOST_NO_CXX11_RVALUE_REFERENCES
 #endif // BOOST_THREAD_PROVIDES_FUTURE_CTOR_ALLOCATORS
 
@@ -1661,7 +2986,13 @@ namespace boost
         }
         packaged_task& operator=(BOOST_THREAD_RV_REF(packaged_task) other) BOOST_NOEXCEPT
         {
+
+            // todo use forward
+#if ! defined  BOOST_NO_CXX11_RVALUE_REFERENCES
+            packaged_task temp(boost::move(other));
+#else
             packaged_task temp(static_cast<BOOST_THREAD_RV_REF(packaged_task)>(other));
+#endif
             swap(temp);
             return *this;
         }
@@ -1687,6 +3018,7 @@ namespace boost
         // result retrieval
         BOOST_THREAD_FUTURE<R> get_future()
         {
+
             if(!task)
             {
                 boost::throw_exception(task_moved());
@@ -1700,12 +3032,34 @@ namespace boost
             {
                 boost::throw_exception(future_already_retrieved());
             }
-            return BOOST_THREAD_FUTURE<R>();
+            //return BOOST_THREAD_FUTURE<R>();
 
         }
 
 
         // execution
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        void operator()(BOOST_THREAD_RV_REF(ArgTypes)... args)
+        {
+            if(!task)
+            {
+                boost::throw_exception(task_moved());
+            }
+            task->run(boost::forward<ArgTypes>(args)...);
+        }
+        void make_ready_at_thread_exit(ArgTypes... args)
+        {
+          if(!task)
+          {
+              boost::throw_exception(task_moved());
+          }
+          if (task->has_value())
+          {
+                boost::throw_exception(promise_already_satisfied());
+          }
+          task->apply(boost::forward<ArgTypes>(args)...);
+        }
+#else
         void operator()()
         {
             if(!task)
@@ -1714,7 +3068,17 @@ namespace boost
             }
             task->run();
         }
-
+        void make_ready_at_thread_exit()
+        {
+          if(!task)
+          {
+              boost::throw_exception(task_moved());
+          }
+          if (task->has_value())
+                boost::throw_exception(promise_already_satisfied());
+          task->apply();
+        }
+#endif
         template<typename F>
         void set_wait_callback(F f)
         {
@@ -1734,131 +3098,829 @@ namespace boost
 
     BOOST_THREAD_DCL_MOVABLE_BEG(T) packaged_task<T> BOOST_THREAD_DCL_MOVABLE_END
 
+    namespace detail
+    {
+    ////////////////////////////////
+    // make_future_deferred_object
+    ////////////////////////////////
+    template <class Rp, class Fp>
+    BOOST_THREAD_FUTURE<Rp>
+    make_future_deferred_object(BOOST_THREAD_FWD_REF(Fp) f)
+    {
+      shared_ptr<future_deferred_object<Rp, Fp> >
+          h(new future_deferred_object<Rp, Fp>(boost::forward<Fp>(f)));
+      return BOOST_THREAD_FUTURE<Rp>(h);
+    }
+
+    ////////////////////////////////
+    // make_future_async_object
+    ////////////////////////////////
+    template <class Rp, class Fp>
+    BOOST_THREAD_FUTURE<Rp>
+    make_future_async_object(BOOST_THREAD_FWD_REF(Fp) f)
+    {
+      shared_ptr<future_async_object<Rp, Fp> >
+          h(new future_async_object<Rp, Fp>(boost::forward<Fp>(f)));
+      return BOOST_THREAD_FUTURE<Rp>(h);
+    }
+
+    }
+
+    ////////////////////////////////
+    // template <class F, class... ArgTypes>
+    // future<R> async(launch policy, F&&, ArgTypes&&...);
+    ////////////////////////////////
+
+#if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
 
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+        template <class R, class... ArgTypes>
+        BOOST_THREAD_FUTURE<R>
+        async(launch policy, R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(ArgTypes)... args)
+        {
+          typedef R(*F)(BOOST_THREAD_FWD_REF(ArgTypes)...);
+          typedef detail::async_func<typename decay<F>::type, typename decay<ArgTypes>::type...> BF;
+          typedef typename BF::result_type Rp;
+  #else
         template <class R>
         BOOST_THREAD_FUTURE<R>
         async(launch policy, R(*f)())
         {
-            if (int(policy) & int(launch::async))
-            {
-              packaged_task<R> pt( f );
+          typedef packaged_task<R()> packaged_task_type;
+  #endif
+#else
+        template <class R>
+        BOOST_THREAD_FUTURE<R>
+        async(launch policy, R(*f)())
+        {
+          typedef packaged_task<R> packaged_task_type;
+#endif
+          if (int(policy) & int(launch::async))
+            {
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          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( f );
 
-              BOOST_THREAD_FUTURE<R> ret = pt.get_future();
+              BOOST_THREAD_FUTURE<R> ret = BOOST_THREAD_MAKE_RV_REF(pt.get_future());
+              ret.set_async();
               boost::thread( boost::move(pt) ).detach();
               return ::boost::move(ret);
+#endif
             }
             else if (int(policy) & int(launch::deferred))
             {
-              packaged_task<R> pt( f );
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          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
+          std::terminate();
+          BOOST_THREAD_FUTURE<R> ret;
+          return ::boost::move(ret);
 
-              BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-              return ::boost::move(ret);
+#endif
             } else {
+              std::terminate();
               BOOST_THREAD_FUTURE<R> ret;
               return ::boost::move(ret);
             }
         }
 
-        template <class R>
-        BOOST_THREAD_FUTURE<R>
-        async(R(*f)())
+#endif
+
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK
+  #if defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+
+        template <class F, class ...ArgTypes>
+        BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type(
+            typename decay<ArgTypes>::type...
+        )>::type>
+        async(launch policy, BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(ArgTypes)... args)
         {
-            return async(launch::any, f);
-        }
-#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
-    template <class F>
-    BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
-    async(launch policy, BOOST_THREAD_FWD_REF(F)  f)
-    {
-        typedef typename boost::result_of<typename decay<F>::type()>::type R;
+
+          typedef typename boost::result_of<typename decay<F>::type(
+              typename decay<ArgTypes>::type...
+          )>::type R;
+
+          typedef detail::async_func<typename decay<F>::type, typename decay<ArgTypes>::type...> BF;
+          typedef typename BF::result_type Rp;
+
+  #else
+        template <class F>
+        BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
+        async(launch policy, BOOST_THREAD_FWD_REF(F)  f)
+        {
+          typedef typename boost::result_of<typename decay<F>::type()>::type R;
+          typedef packaged_task<R()> packaged_task_type;
+
+  #endif
+#else
+        template <class F>
+        BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
+        async(launch policy, BOOST_THREAD_FWD_REF(F)  f)
+        {
+          typedef typename boost::result_of<typename decay<F>::type()>::type R;
+          typedef packaged_task<R> packaged_task_type;
+
+#endif
+
         if (int(policy) & int(launch::async))
         {
-          packaged_task<R> pt( boost::forward<F>(f) );
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          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) );
 
           BOOST_THREAD_FUTURE<R> ret = pt.get_future();
+          ret.set_async();
+//#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+//          boost::thread( boost::move(pt), boost::forward<ArgTypes>(args)... ).detach(); // todo forward
+//#else
           boost::thread( boost::move(pt) ).detach();
+//#endif
           return ::boost::move(ret);
+#endif
         }
         else if (int(policy) & int(launch::deferred))
         {
-          packaged_task<R> pt( boost::forward<F>(f) );
+#if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+          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
+              std::terminate();
+              BOOST_THREAD_FUTURE<R> ret;
+              return ::boost::move(ret);
+//          return boost::detail::make_future_deferred_object<Rp>(
+//              BF(
+//                  thread_detail::decay_copy(boost::forward<F>(f))
+//              )
+//          );
+#endif
 
-          BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-          return ::boost::move(ret);
         } else {
+          std::terminate();
           BOOST_THREAD_FUTURE<R> ret;
           return ::boost::move(ret);
         }
     }
+
+        ////////////////////////////////
+        // template <class F, class... ArgTypes>
+        // future<R> async(F&&, ArgTypes&&...);
+        ////////////////////////////////
+
+    #if defined BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR
+
+    #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            template <class R, class... ArgTypes>
+            BOOST_THREAD_FUTURE<R>
+            async(R(*f)(BOOST_THREAD_FWD_REF(ArgTypes)...), BOOST_THREAD_FWD_REF(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 BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), f));
+            }
+    #endif
+    #endif
+
+    #if defined BOOST_THREAD_PROVIDES_SIGNATURE_PACKAGED_TASK && defined(BOOST_THREAD_PROVIDES_VARIADIC_THREAD)
+            template <class F, class ...ArgTypes>
+            BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type(
+                typename decay<ArgTypes>::type...
+            )>::type>
+            async(BOOST_THREAD_FWD_REF(F) f, BOOST_THREAD_FWD_REF(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::any, boost::forward<F>(f));
+        return BOOST_THREAD_MAKE_RV_REF(async(launch(launch::any), boost::forward<F>(f)));
     }
-#else
+#endif
 
-//    template <class F>
-//    BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
-//    async(launch policy, F const& f)
-//    {
-//        typedef typename boost::result_of<typename decay<F>::type()>::type R;
-//        if (int(policy) & int(launch::async))
-//        {
-//          packaged_task<R> pt( f );
+
+  ////////////////////////////////
+  // make_future deprecated
+  ////////////////////////////////
+  template <typename T>
+  BOOST_THREAD_FUTURE<typename decay<T>::type> make_future(BOOST_THREAD_FWD_REF(T) value)
+  {
+    typedef typename decay<T>::type future_type;
+    promise<future_type> p;
+    p.set_value(boost::forward<T>(value));
+    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;
+    p.set_value();
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future());
+  }
+#endif
+
+  ////////////////////////////////
+  // make_ready_future
+  ////////////////////////////////
+  template <typename T>
+  BOOST_THREAD_FUTURE<typename decay<T>::type> make_ready_future(BOOST_THREAD_FWD_REF(T) value)
+  {
+    typedef typename decay<T>::type future_type;
+    promise<future_type> p;
+    p.set_value(boost::forward<T>(value));
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future());
+  }
+
+#if defined BOOST_THREAD_USES_MOVE
+  inline BOOST_THREAD_FUTURE<void> make_ready_future()
+  {
+    promise<void> p;
+    p.set_value();
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future());
+  }
+#endif
+
+  ////////////////////////////////
+  // make_exceptional_future
+  ////////////////////////////////
+  template <typename T>
+  BOOST_THREAD_FUTURE<T> make_exceptional_future(exception_ptr ex)
+  {
+    promise<T> p;
+    p.set_exception(ex);
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future());
+  }
+
+#if 0
+  template<typename CLOSURE>
+  make_future(CLOSURE closure) -> BOOST_THREAD_FUTURE<decltype(closure())> {
+      typedef decltype(closure() T;
+      promise<T> p;
+      try
+      {
+        p.set_value(closure());
+      }
+      catch(...)
+      {
+        p.set_exception(std::current_exception());
+      }
+      return BOOST_THREAD_MAKE_RV_REF(p.get_future());
+  }
+#endif
+
+  ////////////////////////////////
+  // make_shared_future deprecated
+  ////////////////////////////////
+  template <typename T>
+  shared_future<typename decay<T>::type> make_shared_future(BOOST_THREAD_FWD_REF(T) value)
+  {
+    typedef typename decay<T>::type future_type;
+    promise<future_type> p;
+    p.set_value(boost::forward<T>(value));
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future().share());
+  }
+
+
+  inline shared_future<void> make_shared_future()
+  {
+    promise<void> p;
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future().share());
+
+  }
+
+  ////////////////////////////////
+  // make_ready_shared_future
+  ////////////////////////////////
+  template <typename T>
+  shared_future<typename decay<T>::type> make_ready_shared_future(BOOST_THREAD_FWD_REF(T) value)
+  {
+    typedef typename decay<T>::type future_type;
+    promise<future_type> p;
+    p.set_value(boost::forward<T>(value));
+    return p.get_future().share();
+  }
+
+
+  inline shared_future<void> make_ready_shared_future()
+  {
+    promise<void> p;
+    return BOOST_THREAD_MAKE_RV_REF(p.get_future().share());
+
+  }
+
+  ////////////////////////////////
+  // make_exceptional_shared_future
+  ////////////////////////////////
+  template <typename T>
+  shared_future<T> make_exceptional_shared_future(exception_ptr ex)
+  {
+    promise<T> p;
+    p.set_exception(ex);
+    return p.get_future().share();
+  }
+
+  ////////////////////////////////
+  // detail::future_async_continuation
+  ////////////////////////////////
+#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
+  namespace detail
+  {
+
+    /////////////////////////
+    /// future_async_continuation
+    /////////////////////////
+
+    template<typename F, typename Rp, typename Fp>
+    struct future_async_continuation: future_object<Rp>
+    {
+      typedef future_object<Rp> base_type;
+      typedef typename base_type::move_dest_type move_dest_type;
+      typedef weak_ptr<future_object_base> parent_ptr_type;
+
+      F parent;
+      Fp continuation;
+      boost::thread thr_;
+
+    public:
+      future_async_continuation(
+          F& f, BOOST_THREAD_FWD_REF(Fp) c
+          ) :
+      parent(f.future_),
+      //continuation(boost::move(c)),
+      continuation(c),
+      thr_()
+      {
+        this->set_async();
+      }
+
+      ~future_async_continuation()
+      {
+        if (thr_.get_id()==thread::id())
+        {
+          //BOOST_THREAD_LOG << "ERRORRRRRRRRR ~future_async_continuation " << this << " " << thr_.get_id() << BOOST_THREAD_END_LOG;
+          return;
+        }
+        if (thr_.joinable()) {
+          thr_.join();
+        }
+      }
+
+      void launch_continuation(boost::unique_lock<boost::mutex>& lock)
+      {
+        lock.unlock();
+        thr_ = thread(&future_async_continuation::run, this);
+      }
+
+      move_dest_type get()
+      {
+          if (thr_.joinable()) thr_.join();
+          // fixme Is the lock needed during the whole scope?
+          //this->wait();
+          boost::unique_lock<boost::mutex> lock(this->mutex);
+          this->wait_internal(lock);
+
+          // fixme use boost::move
+          return static_cast<move_dest_type>(*(this->result));
+      }
+      static void run(future_async_continuation* that)
+      {
+        try
+        {
+          that->mark_finished_with_result(that->continuation(that->parent));
+        }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+        catch(thread_interrupted& )
+        {
+          that->mark_interrupted_finish();
+        }
+#endif
+        catch(...)
+        {
+          that->mark_exceptional_finish();
+        }
+      }
+    };
+
+    template<typename F, typename Fp>
+    struct future_async_continuation<F, void, Fp>: public future_object<void>
+    {
+      typedef future_object<void> base_type;
+      F parent;
+      Fp continuation;
+      boost::thread thr_;
+
+    public:
+      future_async_continuation(
+          F& f, BOOST_THREAD_FWD_REF(Fp) c
+          ) :
+      parent(f.future_),
+      continuation(boost::move(c)),
+      thr_()
+      {
+        this->set_async();
+      }
+
+      ~future_async_continuation()
+      {
+        if (thr_.get_id()==thread::id())
+        {
+          return;
+        }
+        if (thr_.joinable()) thr_.join();
+      }
+
+      void launch_continuation(boost::unique_lock<boost::mutex>& lk)
+      {
+        lk.unlock();
+        thr_ = thread(&future_async_continuation::run, this);
+      }
+
+      static void run(future_async_continuation* that)
+      {
+        try
+        {
+          that->continuation(that->parent);
+          that->mark_finished_with_result();
+        }
+#if defined BOOST_THREAD_PROVIDES_INTERRUPTIONS
+        catch(thread_interrupted& )
+        {
+          that->mark_interrupted_finish();
+        }
+#endif
+        catch(...)
+        {
+          that->mark_exceptional_finish();
+        }
+      }
+    };
+
+
+    //////////////////////////
+    /// future_deferred_continuation
+    //////////////////////////
+    template<typename F, typename Rp, typename Fp>
+    struct future_deferred_continuation: future_object<Rp>
+    {
+      typedef future_object<Rp> base_type;
+      F parent;
+      Fp continuation;
+
+    public:
+      future_deferred_continuation(
+          F& f, BOOST_THREAD_FWD_REF(Fp) c
+          ) :
+          parent(f.future_),
+          //continuation(boost::move(c))
+          continuation(c)
+      {
+        this->set_deferred();
+      }
+
+      virtual void launch_continuation(boost::unique_lock<boost::mutex>& lk)
+      {
+        execute(lk);
+      }
+
+      virtual void execute(boost::unique_lock<boost::mutex>& lck) {
+        try
+        {
+          this->mark_finished_with_result_internal(continuation(parent), lck);
+        }
+        catch (...)
+        {
+          this->mark_exceptional_finish_internal(current_exception(), lck);
+        }
+      }
+    };
+
+    template<typename F, typename Fp>
+    struct future_deferred_continuation<F,void,Fp>: future_object<void>
+    {
+      typedef future_object<void> base_type;
+      F parent;
+      Fp continuation;
+
+    public:
+      future_deferred_continuation(
+          F& f, BOOST_THREAD_FWD_REF(Fp) c
+          ):
+          parent(f.future_),
+          continuation(boost::move(c))
+      {
+        this->set_deferred();
+      }
+
+      virtual void launch_continuation(boost::unique_lock<boost::mutex>& lk)
+      {
+        execute(lk);
+      }
+      virtual void execute(boost::unique_lock<boost::mutex>& lck) {
+        try
+        {
+          continuation(parent);
+          this->mark_finished_with_result_internal(lck);
+        }
+        catch (...)
+        {
+          this->mark_exceptional_finish_internal(current_exception(), lck);
+        }
+      }
+    };
+
+    ////////////////////////////////
+    // make_future_deferred_continuation
+    ////////////////////////////////
+    template<typename F, typename Rp, typename Fp>
+    BOOST_THREAD_FUTURE<Rp>
+    make_future_deferred_continuation(
+        boost::unique_lock<boost::mutex> &lock,
+        F& f, BOOST_THREAD_FWD_REF(Fp) c
+        )
+    {
+      shared_ptr<future_deferred_continuation<F, Rp, Fp> >
+          h(new future_deferred_continuation<F, Rp, Fp>(f, boost::forward<Fp>(c)));
+      f.future_->set_continuation_ptr(h, lock);
+      return BOOST_THREAD_FUTURE<Rp>(h);
+    }
+
+    ////////////////////////////////
+    // make_future_async_continuation
+    ////////////////////////////////
+    template<typename F, typename Rp, typename Fp>
+    BOOST_THREAD_FUTURE<Rp>
+    make_future_async_continuation(
+        boost::unique_lock<boost::mutex> &lock, F& f, BOOST_THREAD_FWD_REF(Fp) c
+        )
+    {
+      shared_ptr<future_async_continuation<F,Rp, Fp> >
+          h(new future_async_continuation<F,Rp, Fp>(f, boost::forward<Fp>(c)));
+      f.future_->set_continuation_ptr(h, lock);
+
+      return BOOST_THREAD_FUTURE<Rp>(h);
+    }
+
+//      template <typename F, typename R, typename C>
+//      struct future_continuation : future_object<R>
+//      {
+//        F& parent;
+//        C continuation;
+//        launch policy_;
 //
-//          BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-//          boost::thread( boost::move(pt) ).detach();
-//          return ::boost::move(ret);
+//        future_continuation(boost::unique_lock<boost::mutex>& lk, F& f, BOOST_THREAD_FWD_REF(C) c) :
+//          parent(f),
+//          continuation(boost::forward<C>(c)),
+//          policy_(f.launch_policy())
+//        {
+//          init_continuation(lk);
 //        }
-//        else if (int(policy) & int(launch::deferred))
+//        future_continuation(boost::unique_lock<boost::mutex>& lk, F& f, BOOST_THREAD_FWD_REF(C) c, launch policy) :
+//          parent(f),
+//          continuation(boost::forward<C>(c)),
+//          policy_(policy)
 //        {
-//          packaged_task<R> pt( f );
+//          init_continuation(lk);
+//        }
+//        ~future_continuation()
+//        {}
 //
-//          BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-//          return ::boost::move(ret);
-//        } else {
-//          BOOST_THREAD_FUTURE<R> ret;
-//          return ::boost::move(ret);
+//        void init_continuation(boost::unique_lock<boost::mutex>& lk)
+//        {
+//          try
+//          {
+//            lk.unlock();
+//            // fixme what to do depending on inherits_launch_policy_ and policy_?
+//            if (int(policy_) & int(launch::deferred))
+//            {
+//              R val = continuation(parent);
+//              next.set_value(boost::move(val));
+//            }
+//            else
+//            {
+//              BOOST_THREAD_FUTURE<R> f = async(policy_, continuation, boost::ref(parent));
+//              R val = f.get();
+//              next.set_value(boost::move(val));
+//            }
+//          }
+//          catch (...)
+//          {
+//            next.set_exception(boost::current_exception());
+//          }
 //        }
-//    }
-//    template <class F>
-//    BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type>
-//    async(F const& f)
-//    {
-//        return async(launch::any, f);
-//    }
+//      private:
+//
+//        future_continuation(future_continuation const&);
+//        future_continuation& operator=(future_continuation const&);
+//      };
+//#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+//      template <typename F, typename R, typename CR>
+//      struct future_continuation<F,R,CR(*)(F&)> : future_object<R>
+//      {
+//        F& parent;
+//        CR(*continuation)(F&) ;
+//        launch policy_;
+//
+//        future_continuation(F& f, CR(*c)(F&)) :
+//          parent(f),
+//          continuation(c),
+//          policy_(f.launch_policy()),
+//          next()
+//        {}
+//        future_continuation(F& f, CR(*c)(F&), launch policy) :
+//          parent(f),
+//          continuation(c),
+//          policy_(policy),
+//          next()
+//        {}
+//        ~future_continuation()
+//        {}
+//
+//        void start_continuation(boost::unique_lock<boost::mutex>& lk)
+//        {
+//          try
+//          {
+//            lk.unlock();
+//            // fixme what to do depending on inherits_launch_policy_ and policy_?
+//            if (int(policy_) & int(launch::deferred))
+//            {
+//              R val = continuation(parent);
+//              next.set_value(boost::move(val));
+//            }
+//            else
+//            {
+//              BOOST_THREAD_FUTURE<R> f = async(policy_, continuation, boost::ref(parent));
+//              R val = f.get();
+//              next.set_value(boost::move(val));
+//            }
+//          }
+//          catch (...)
+//          {
+//            next.set_exception(boost::current_exception());
+//          }
+//        }
+//      private:
+//
+//        future_continuation(future_continuation const&);
+//        future_continuation& operator=(future_continuation const&);
+//      };
+//#endif
+  }
 
-    template <class F>
-    BOOST_THREAD_FUTURE<typename boost::result_of<typename decay<F>::type()>::type>
-    async(launch policy, BOOST_THREAD_FWD_REF(F)  f)
+  ////////////////////////////////
+  // template<typename F>
+  // auto future<R>::then(F&& func) -> BOOST_THREAD_FUTURE<decltype(func(*this))>;
+  ////////////////////////////////
+
+  template <typename R>
+  template <typename F>
+  inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE<R>&)>::type>
+  BOOST_THREAD_FUTURE<R>::then(launch policy, BOOST_THREAD_FWD_REF(F) func)
+  {
+
+      typedef typename boost::result_of<F(BOOST_THREAD_FUTURE<R>&)>::type future_type;
+
+      if (this->future_==0)
+      {
+        // fixme what to do when the future has no associated state?
+        return BOOST_THREAD_FUTURE<future_type>();
+      }
+
+      boost::unique_lock<boost::mutex> lock(this->future_->mutex);
+      if (int(policy) & int(launch::async))
     {
-        typedef typename boost::result_of<typename decay<F>::type()>::type R;
-        if (int(policy) & int(launch::async))
+      return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_async_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(
+          lock, *this, boost::forward<F>(func)
+      )));
+    }
+      else
+        if (int(policy) & int(launch::deferred))
         {
-          packaged_task<R> pt( boost::forward<F>(f) );
-
-          BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-          boost::thread( boost::move(pt) ).detach();
-          return ::boost::move(ret);
+          return BOOST_THREAD_MAKE_RV_REF((boost::detail::make_future_deferred_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(
+              lock, *this, boost::forward<F>(func)
+          )));
         }
-        else if (int(policy) & int(launch::deferred))
-        {
-          packaged_task<R> pt( boost::forward<F>(f) );
+      else
+      {
+        // fixme what to do when the policy is invalid?
+        return BOOST_THREAD_FUTURE<future_type>();
+      }
 
-          BOOST_THREAD_FUTURE<R> ret = pt.get_future();
-          return ::boost::move(ret);
-        } else {
-          BOOST_THREAD_FUTURE<R> ret;
-          return ::boost::move(ret);
-        }
+  }
+  template <typename R>
+  template <typename F>
+  inline BOOST_THREAD_FUTURE<typename boost::result_of<F(BOOST_THREAD_FUTURE<R>&)>::type>
+  BOOST_THREAD_FUTURE<R>::then(BOOST_THREAD_FWD_REF(F) func)
+  {
+
+    typedef typename boost::result_of<F(BOOST_THREAD_FUTURE<R>&)>::type future_type;
+
+    if (this->future_==0)
+    {
+      //BOOST_THREAD_LOG << "ERROR future::then " << this << BOOST_THREAD_END_LOG;
+      // fixme what to do when the future has no associated state?
+      return BOOST_THREAD_FUTURE<future_type>();
     }
-    template <class F>
-    BOOST_THREAD_FUTURE<typename boost::result_of<F()>::type>
-    async(BOOST_THREAD_FWD_REF(F) f)
+
+    boost::unique_lock<boost::mutex> lock(this->future_->mutex);
+    if (int(this->launch_policy()) & int(launch::async))
+    {
+      return boost::detail::make_future_async_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(
+          lock, *this, boost::forward<F>(func)
+      );
+    }
+    else if (int(this->launch_policy()) & int(launch::deferred))
+    {
+      this->future_->wait_internal(lock);
+      return boost::detail::make_future_deferred_continuation<BOOST_THREAD_FUTURE<R>, future_type, F>(
+          lock, *this, boost::forward<F>(func)
+      );
+    }
+    else
     {
-        return async(launch::any, boost::forward<F>(f));
+      // fixme what to do when the policy is invalid?
+      return BOOST_THREAD_FUTURE<future_type>();
     }
+  }
+//#if 0 && defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+//  template <typename R>
+//  template<typename RF>
+//  BOOST_THREAD_FUTURE<RF>
+//  BOOST_THREAD_FUTURE<R>::then(RF(*func)(BOOST_THREAD_FUTURE<R>&))
+//  {
+//
+//    typedef RF future_type;
+//
+//    if (this->future_)
+//    {
+//      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);
+//      if (ptr==0)
+//      {
+//        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
+//      }
+//      this->future_->set_continuation_ptr(ptr, lock);
+//      return ptr->get_future();
+//    } else {
+//      // fixme what to do when the future has no associated state?
+//      return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
+//    }
+//
+//  }
+//  template <typename R>
+//  template<typename RF>
+//  BOOST_THREAD_FUTURE<RF>
+//  BOOST_THREAD_FUTURE<R>::then(launch policy, RF(*func)(BOOST_THREAD_FUTURE<R>&))
+//  {
+//
+//    typedef RF future_type;
+//
+//    if (this->future_)
+//    {
+//      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);
+//      if (ptr==0)
+//      {
+//        return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
+//      }
+//      this->future_->set_continuation_ptr(ptr, lock);
+//      return ptr->get_future();
+//    } else {
+//      // fixme what to do when the future has no associated state?
+//      return BOOST_THREAD_MAKE_RV_REF(BOOST_THREAD_FUTURE<future_type>());
+//    }
+//
+//  }
+//#endif
 
 #endif