OSDN Git Service

Backport from mainline
[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / std / future
index badb6e0..150c1af 100644 (file)
@@ -1,6 +1,6 @@
 // <future> -*- C++ -*-
 
-// Copyright (C) 2009 Free Software Foundation, Inc.
+// Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -22,7 +22,7 @@
 // see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-/** @file future
+/** @file include/future
  *  This is a Standard C++ Library header.
  */
 
 #pragma GCC system_header
 
 #ifndef __GXX_EXPERIMENTAL_CXX0X__
-# include <c++0x_warning.h>
+# include <bits/c++0x_warning.h>
 #else
 
 #include <functional>
 #include <memory>
 #include <mutex>
+#include <thread>
 #include <condition_variable>
 #include <system_error>
 #include <exception>
-#include <cstdatomic>
+#include <atomic>
+#include <bits/functexcept.h>
 
-namespace std
+namespace std _GLIBCXX_VISIBILITY(default)
 {
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
   /**
    * @defgroup futures Futures
    * @ingroup concurrency
@@ -55,23 +59,30 @@ namespace std
 
   /// Error code for futures
   enum class future_errc
-  { broken_promise, future_already_retrieved, promise_already_satisfied };
+  {
+    future_already_retrieved = 1,
+    promise_already_satisfied,
+    no_state,
+    broken_promise
+  };
 
-  // TODO: requires concepts
-  // concept_map ErrorCodeEnum<future_errc> { }
+  /// Specialization.
   template<>
     struct is_error_code_enum<future_errc> : public true_type { };
 
   /// Points to a statically-allocated object derived from error_category.
-  extern const error_category* const future_category;
+  const error_category&
+  future_category() noexcept;
 
-  // TODO: requires constexpr
-  inline error_code make_error_code(future_errc __errc)
-  { return error_code(static_cast<int>(__errc), *future_category); }
+  /// Overload for make_error_code.
+  inline error_code
+  make_error_code(future_errc __errc) noexcept
+  { return error_code(static_cast<int>(__errc), future_category()); }
 
-  // TODO: requires constexpr
-  inline error_condition make_error_condition(future_errc __errc)
-  { return error_condition(static_cast<int>(__errc), *future_category); }
+  /// Overload for make_error_condition.
+  inline error_condition
+  make_error_condition(future_errc __errc) noexcept
+  { return error_condition(static_cast<int>(__errc), future_category()); }
 
   /**
    *  @brief Exception type thrown by futures.
@@ -79,495 +90,872 @@ namespace std
    */
   class future_error : public logic_error
   {
-    error_code _M_code;
+    error_code                         _M_code;
 
   public:
-    explicit future_error(future_errc __ec)
-    : logic_error("std::future_error"), _M_code(make_error_code(__ec))
+    explicit future_error(error_code __ec)
+    : logic_error("std::future_error"), _M_code(__ec)
     { }
 
-    virtual ~future_error() throw();
+    virtual ~future_error() noexcept;
 
-    virtual const char* 
-    what() const throw();
+    virtual const char*
+    what() const noexcept;
 
-    const error_code& 
-    code() const throw() { return _M_code; }
+    const error_code&
+    code() const noexcept { return _M_code; }
   };
 
   // Forward declarations.
-  template<typename _Result>
-    class unique_future;
+  template<typename _Res>
+    class future;
 
-  template<typename _Result>
+  template<typename _Res>
     class shared_future;
 
-  template<typename
+  template<typename _Signature>
     class packaged_task;
 
-  template<typename _Result>
+  template<typename _Res>
     class promise;
 
-#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
-  && defined(_GLIBCXX_ATOMIC_BUILTINS_4)
+  /// Launch code for futures
+  enum class launch
+  {
+    async = 1,
+    deferred = 2
+  };
 
-  // Holds the result of a future
-  struct _Future_result_base
+  constexpr launch operator&(launch __x, launch __y)
   {
-    _Future_result_base() = default;
-    _Future_result_base(const _Future_result_base&) = delete;
-    _Future_result_base& operator=(const _Future_result_base&) = delete;
+    return static_cast<launch>(
+       static_cast<int>(__x) & static_cast<int>(__y));
+  }
 
-    exception_ptr _M_error;
+  constexpr launch operator|(launch __x, launch __y)
+  {
+    return static_cast<launch>(
+       static_cast<int>(__x) | static_cast<int>(__y));
+  }
 
-    // _M_destroy() allows derived classes to control deallocation,
-    // which will be needed when allocator support is added to promise.
-    // See http://gcc.gnu.org/ml/libstdc++/2009-06/msg00032.html
-    virtual void _M_destroy() = 0;
-    struct _Deleter
-    {
-      void operator()(_Future_result_base* __fr) const { __fr->_M_destroy(); }
-    };
+  constexpr launch operator^(launch __x, launch __y)
+  {
+    return static_cast<launch>(
+       static_cast<int>(__x) ^ static_cast<int>(__y));
+  }
 
-  protected:
-    ~_Future_result_base() = default;
+  constexpr launch operator~(launch __x)
+  { return static_cast<launch>(~static_cast<int>(__x)); }
+
+  inline launch& operator&=(launch& __x, launch __y)
+  { return __x = __x & __y; }
+
+  inline launch& operator|=(launch& __x, launch __y)
+  { return __x = __x | __y; }
+
+  inline launch& operator^=(launch& __x, launch __y)
+  { return __x = __x ^ __y; }
+
+  /// Status code for futures
+  enum class future_status
+  {
+    ready,
+    timeout,
+    deferred
   };
 
-  // TODO: use template alias when available
-  /*
-   template<typename _Res>
-     using _Future_ptr = unique_ptr<_Res, _Future_result_base::_Deleter>;
-   */
-  template<typename _Res>
-    struct _Future_ptr
+  template<typename _Fn, typename... _Args>
+    future<typename result_of<_Fn(_Args...)>::type>
+    async(launch __policy, _Fn&& __fn, _Args&&... __args);
+
+  template<typename _FnCheck, typename _Fn, typename... _Args>
+    struct __async_sfinae_helper
     {
-      typedef unique_ptr<_Res, _Future_result_base::_Deleter> type;
+      typedef future<typename result_of<_Fn(_Args...)>::type> type;
     };
 
-  // State shared between a promise and one or more associated futures.
-  class _Future_state
-  {
-    typedef _Future_ptr<_Future_result_base>::type _Future_ptr_type;
-
-  public:
-    _Future_state() : _M_result(), _M_retrieved(false) { }
+  template<typename _Fn, typename... _Args>
+    struct __async_sfinae_helper<launch, _Fn, _Args...>
+    { };
 
-    _Future_state(const _Future_state&) = delete;
-    _Future_state& operator=(const _Future_state&) = delete;
+  template<typename _Fn, typename... _Args>
+    typename
+    __async_sfinae_helper<typename decay<_Fn>::type, _Fn, _Args...>::type
+    async(_Fn&& __fn, _Args&&... __args);
 
-    bool
-    is_ready()
-    { return _M_get() != 0; }
+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
+  && (ATOMIC_INT_LOCK_FREE > 1)
 
-    bool
-    has_exception()
+  /// Base class and enclosing scope.
+  struct __future_base
+  {
+    /// Base class for results.
+    struct _Result_base
     {
-      _Future_result_base* const __res = _M_get();
-      return __res && !(__res->_M_error == 0);
-    }
+      exception_ptr            _M_error;
 
-    bool
-    has_value()
-    {
-      _Future_result_base* const __res = _M_get();
-      return __res && (__res->_M_error == 0);
-    }
+      _Result_base(const _Result_base&) = delete;
+      _Result_base& operator=(const _Result_base&) = delete;
 
-    _Future_result_base&
-    wait()
-    {
-      unique_lock<mutex> __lock(_M_mutex);
-      if (!_M_ready())
-        _M_cond.wait(__lock, std::bind(&_Future_state::_M_ready, this));
-      return *_M_result;
-    }
+      // _M_destroy() allows derived classes to control deallocation
+      virtual void _M_destroy() = 0;
 
-    template<typename _Rep, typename _Period>
-      bool
-      wait_for(const chrono::duration<_Rep, _Period>& __rel)
+      struct _Deleter
       {
-        unique_lock<mutex> __lock(_M_mutex);
-        return _M_ready() || _M_cond.wait_for(__lock, __rel,
-            std::bind(&_Future_state::_M_ready, this));
-      }
+       void operator()(_Result_base* __fr) const { __fr->_M_destroy(); }
+      };
 
-    template<typename _Clock, typename _Duration>
-      bool
-      wait_until(const chrono::time_point<_Clock, _Duration>& __abs)
+    protected:
+      _Result_base();
+      virtual ~_Result_base();
+    };
+
+    /// Result.
+    template<typename _Res>
+      struct _Result : _Result_base
       {
-        unique_lock<mutex> __lock(_M_mutex);
-        return _M_ready() || _M_cond.wait_until(__lock, __abs,
-            std::bind(&_Future_state::_M_ready, this));
-      }
+      private:
+       typedef alignment_of<_Res>                              __a_of;
+       typedef aligned_storage<sizeof(_Res), __a_of::value>    __align_storage;
+       typedef typename __align_storage::type                  __align_type;
+
+       __align_type            _M_storage;
+       bool                    _M_initialized;
+
+      public:
+       _Result() noexcept : _M_initialized() { }
+       
+       ~_Result()
+       {
+         if (_M_initialized)
+           _M_value().~_Res();
+       }
+
+       // Return lvalue, future will add const or rvalue-reference
+       _Res&
+       _M_value() noexcept { return *static_cast<_Res*>(_M_addr()); }
+
+       void
+       _M_set(const _Res& __res)
+       {
+         ::new (_M_addr()) _Res(__res);
+         _M_initialized = true;
+       }
+
+       void
+       _M_set(_Res&& __res)
+       {
+         ::new (_M_addr()) _Res(std::move(__res));
+         _M_initialized = true;
+       }
+
+      private:
+       void _M_destroy() { delete this; }
+
+       void* _M_addr() noexcept { return static_cast<void*>(&_M_storage); }
+    };
 
-    void
-    _M_set_result(_Future_ptr_type __res)
-    {
+    /// A unique_ptr based on the instantiating type.
+    template<typename _Res>
+      using _Ptr = unique_ptr<_Res, _Result_base::_Deleter>;
+
+    /// Result_alloc.
+    template<typename _Res, typename _Alloc>
+      struct _Result_alloc final : _Result<_Res>, _Alloc
       {
-        lock_guard<mutex> __lock(_M_mutex);
-        if (_M_ready())
-         __throw_future_error(int(future_errc::promise_already_satisfied));
-        _M_result.swap(__res);
-      }
-      _M_cond.notify_all();
-    }
+        typedef typename allocator_traits<_Alloc>::template
+          rebind_alloc<_Result_alloc> __allocator_type;
 
-    void
-    _M_break_promise(_Future_ptr_type __res)
-    {
-      if (static_cast<bool>(__res))
+        explicit
+       _Result_alloc(const _Alloc& __a) : _Result<_Res>(), _Alloc(__a)
+        { }
+       
+      private:
+       void _M_destroy()
+        {
+         typedef allocator_traits<__allocator_type> __traits;
+          __allocator_type __a(*this);
+         __traits::destroy(__a, this);
+         __traits::deallocate(__a, this, 1);
+        }
+      };
+
+    template<typename _Res, typename _Allocator>
+      static _Ptr<_Result_alloc<_Res, _Allocator>>
+      _S_allocate_result(const _Allocator& __a)
       {
-        __res->_M_error
-          = std::copy_exception(future_error(future_errc::broken_promise));
+        typedef _Result_alloc<_Res, _Allocator>        __result_type;
+       typedef allocator_traits<typename __result_type::__allocator_type>
+         __traits;
+        typename __traits::allocator_type __a2(__a);
+        __result_type* __p = __traits::allocate(__a2, 1);
+        __try
+       {
+         __traits::construct(__a2, __p, __a);
+        }
+        __catch(...)
         {
-          lock_guard<mutex> __lock(_M_mutex);
-          _M_result.swap(__res);
+         __traits::deallocate(__a2, __p, 1);
+          __throw_exception_again;
         }
-        _M_cond.notify_all();
+        return _Ptr<__result_type>(__p);
       }
-    }
 
-    // called when this object is passed to a unique_future
-    void
-    _M_set_retrieved_flag()
-    {
-      if (_M_retrieved.test_and_set())
-        __throw_future_error(int(future_errc::future_already_retrieved));
-    }
 
-  private:
-    _Future_result_base*
-    _M_get()
+    /// Base class for state between a promise and one or more
+    /// associated futures.
+    class _State_base
     {
-      lock_guard<mutex> __lock(_M_mutex);
-      return _M_result.get();
-    }
+      typedef _Ptr<_Result_base> _Ptr_type;
 
-    bool _M_ready() const { return static_cast<bool>(_M_result); }
+      _Ptr_type                        _M_result;
+      mutex                    _M_mutex;
+      condition_variable       _M_cond;
+      atomic_flag              _M_retrieved;
+      once_flag                        _M_once;
 
-    _Future_ptr_type    _M_result;
-    mutex               _M_mutex;
-    condition_variable  _M_cond;
-    atomic_flag         _M_retrieved;
-  };
+    public:
+      _State_base() noexcept : _M_result(), _M_retrieved(ATOMIC_FLAG_INIT) { }
+      _State_base(const _State_base&) = delete;
+      _State_base& operator=(const _State_base&) = delete;
+      virtual ~_State_base();
 
-  // workaround for CWG issue 664 and c++/34022
-  template<typename _Result, bool = is_scalar<_Result>::value>
-    struct _Move_future_result
-    {
-      typedef _Result&& __rval_type;
-      static _Result&& _S_move(_Result& __res) { return std::move(__res); }
-    };
+      _Result_base&
+      wait()
+      {
+       _M_run_deferred();
+       unique_lock<mutex> __lock(_M_mutex);
+       _M_cond.wait(__lock, [&] { return _M_ready(); });
+       return *_M_result;
+      }
 
-  // specialization for scalar types returns rvalue not rvalue-reference
-  template<typename _Result>
-    struct _Move_future_result<_Result, true>
-    {
-      typedef _Result __rval_type;
-      static _Result _S_move(_Result __res) { return __res; }
-    };
+      template<typename _Rep, typename _Period>
+        future_status
+        wait_for(const chrono::duration<_Rep, _Period>& __rel)
+        {
+         unique_lock<mutex> __lock(_M_mutex);
+         if (_M_cond.wait_for(__lock, __rel, [&] { return _M_ready(); }))
+           return future_status::ready;
+         return future_status::timeout;
+       }
 
-  template<typename _Result>
-    struct _Future_result : _Future_result_base
-    {
-      _Future_result() : _M_initialized() { }
+      template<typename _Clock, typename _Duration>
+        future_status
+        wait_until(const chrono::time_point<_Clock, _Duration>& __abs)
+        {
+         unique_lock<mutex> __lock(_M_mutex);
+         if (_M_cond.wait_until(__lock, __abs, [&] { return _M_ready(); }))
+           return future_status::ready;
+         return future_status::timeout;
+       }
 
-      ~_Future_result()
+      void
+      _M_set_result(function<_Ptr_type()> __res, bool __ignore_failure = false)
       {
-        if (_M_initialized)
-          _M_value().~_Result();
+        bool __set = __ignore_failure;
+        // all calls to this function are serialized,
+        // side-effects of invoking __res only happen once
+        call_once(_M_once, &_State_base::_M_do_set, this, ref(__res),
+            ref(__set));
+        if (!__set)
+          __throw_future_error(int(future_errc::promise_already_satisfied));
       }
 
-      // return lvalue, future will add const or rvalue-reference
-      _Result& _M_value()
-      { return *static_cast<_Result*>(_M_addr()); }
-
       void
-      _M_set(const _Result& __res)
+      _M_break_promise(_Ptr_type __res)
       {
-        ::new (_M_addr()) _Result(__res);
-        _M_initialized = true;
+       if (static_cast<bool>(__res))
+         {
+           error_code __ec(make_error_code(future_errc::broken_promise));
+           __res->_M_error = copy_exception(future_error(__ec));
+           {
+             lock_guard<mutex> __lock(_M_mutex);
+             _M_result.swap(__res);
+           }
+           _M_cond.notify_all();
+         }
       }
 
+      // Called when this object is passed to a future.
       void
-      _M_set(_Result&& __res)
+      _M_set_retrieved_flag()
       {
-        typedef _Move_future_result<_Result> _Mover;
-        ::new (_M_addr()) _Result(_Mover::_S_move(__res));
-        _M_initialized = true;
+       if (_M_retrieved.test_and_set())
+         __throw_future_error(int(future_errc::future_already_retrieved));
       }
 
+      template<typename _Res, typename _Arg>
+        struct _Setter;
+
+      // set lvalues
+      template<typename _Res, typename _Arg>
+        struct _Setter<_Res, _Arg&>
+        {
+          // check this is only used by promise<R>::set_value(const R&)
+          // or promise<R>::set_value(R&)
+          static_assert(is_same<_Res, _Arg&>::value  // promise<R&>
+              || is_same<const _Res, _Arg>::value,  // promise<R>
+              "Invalid specialisation");
+
+          typename promise<_Res>::_Ptr_type operator()()
+          {
+            _State_base::_S_check(_M_promise->_M_future);
+            _M_promise->_M_storage->_M_set(_M_arg);
+            return std::move(_M_promise->_M_storage);
+          }
+          promise<_Res>*    _M_promise;
+          _Arg&             _M_arg;
+        };
+
+      // set rvalues
+      template<typename _Res>
+        struct _Setter<_Res, _Res&&>
+        {
+          typename promise<_Res>::_Ptr_type operator()()
+          {
+            _State_base::_S_check(_M_promise->_M_future);
+            _M_promise->_M_storage->_M_set(std::move(_M_arg));
+            return std::move(_M_promise->_M_storage);
+          }
+          promise<_Res>*    _M_promise;
+          _Res&             _M_arg;
+        };
+
+      struct __exception_ptr_tag { };
+
+      // set exceptions
+      template<typename _Res>
+        struct _Setter<_Res, __exception_ptr_tag>
+        {
+          typename promise<_Res>::_Ptr_type operator()()
+          {
+            _State_base::_S_check(_M_promise->_M_future);
+            _M_promise->_M_storage->_M_error = _M_ex;
+            return std::move(_M_promise->_M_storage);
+          }
+
+          promise<_Res>*   _M_promise;
+          exception_ptr&    _M_ex;
+        };
+
+      template<typename _Res, typename _Arg>
+        static _Setter<_Res, _Arg&&>
+        __setter(promise<_Res>* __prom, _Arg&& __arg)
+        {
+          return _Setter<_Res, _Arg&&>{ __prom, __arg };
+        }
+
+      template<typename _Res>
+        static _Setter<_Res, __exception_ptr_tag>
+        __setter(exception_ptr& __ex, promise<_Res>* __prom)
+        {
+          return _Setter<_Res, __exception_ptr_tag>{ __prom, __ex };
+        }
+
+      static _Setter<void, void>
+      __setter(promise<void>* __prom);
+
+      template<typename _Tp>
+        static void
+        _S_check(const shared_ptr<_Tp>& __p)
+        {
+          if (!static_cast<bool>(__p))
+            __throw_future_error((int)future_errc::no_state);
+        }
+
     private:
-      void _M_destroy() { delete this; }
+      void
+      _M_do_set(function<_Ptr_type()>& __f, bool& __set)
+      {
+        _Ptr_type __res = __f();
+        {
+          lock_guard<mutex> __lock(_M_mutex);
+          _M_result.swap(__res);
+        }
+        _M_cond.notify_all();
+        __set = true;
+      }
 
-      void* _M_addr() { return static_cast<void*>(&_M_storage); }
+      bool _M_ready() const noexcept { return static_cast<bool>(_M_result); }
 
-      typename aligned_storage<sizeof(_Result),
-               alignment_of<_Result>::value>::type _M_storage;
-      bool _M_initialized;
+      // Misnamed: waits for completion of async function.
+      virtual void _M_run_deferred() { }
     };
 
-  template<typename _Result>
-    struct _Future_result<_Result&> : _Future_result_base
+    template<typename _BoundFn, typename = typename _BoundFn::result_type>
+      class _Deferred_state;
+
+    class _Async_state_common;
+
+    template<typename _BoundFn, typename = typename _BoundFn::result_type>
+      class _Async_state_impl;
+
+    template<typename _Signature>
+      class _Task_state;
+
+    template<typename _BoundFn>
+      static std::shared_ptr<_State_base>
+      _S_make_deferred_state(_BoundFn&& __fn);
+
+    template<typename _BoundFn>
+      static std::shared_ptr<_State_base>
+      _S_make_async_state(_BoundFn&& __fn);
+
+    template<typename _Res_ptr, typename _Res>
+      struct _Task_setter;
+
+    template<typename _Res_ptr, typename _BoundFn>
+      class _Task_setter_helper
+      {
+       typedef typename remove_reference<_BoundFn>::type::result_type __res;
+      public:
+       typedef _Task_setter<_Res_ptr, __res> __type;
+      };
+
+    template<typename _Res_ptr, typename _BoundFn>
+      static typename _Task_setter_helper<_Res_ptr, _BoundFn>::__type
+      _S_task_setter(_Res_ptr& __ptr, _BoundFn&& __call)
+      {
+       typedef _Task_setter_helper<_Res_ptr, _BoundFn> __helper_type;
+       typedef typename __helper_type::__type _Setter;
+       return _Setter{ __ptr, std::ref(__call) };
+      }
+  };
+
+  /// Partial specialization for reference types.
+  template<typename _Res>
+    struct __future_base::_Result<_Res&> : __future_base::_Result_base
     {
-      _Future_result() : _M_value_ptr() { }
+      _Result() noexcept : _M_value_ptr() { }
+
+      void _M_set(_Res& __res) noexcept { _M_value_ptr = &__res; }
 
-      _Result* _M_value_ptr;
+      _Res& _M_get() noexcept { return *_M_value_ptr; }
+
+    private:
+      _Res*                    _M_value_ptr;
 
       void _M_destroy() { delete this; }
     };
 
+  /// Explicit specialization for void.
   template<>
-    struct _Future_result<void> : _Future_result_base
+    struct __future_base::_Result<void> : __future_base::_Result_base
     {
+    private:
       void _M_destroy() { delete this; }
     };
 
-  // common implementation for unique_future and shared_future
-  template<typename _Result>
-    class _Future_impl
+
+  /// Common implementation for future and shared_future.
+  template<typename _Res>
+    class __basic_future : public __future_base
     {
-    public:
-      // disable copying
-      _Future_impl(const _Future_impl&) = delete;
-      _Future_impl& operator=(const _Future_impl&) = delete;
+    protected:
+      typedef shared_ptr<_State_base>          __state_type;
+      typedef __future_base::_Result<_Res>&    __result_type;
 
-      // functions to check state and wait for ready
-      bool is_ready() const { return this->_M_state->is_ready(); }
+    private:
+      __state_type             _M_state;
 
-      bool has_exception() const { return this->_M_state->has_exception(); }
+    public:
+      // Disable copying.
+      __basic_future(const __basic_future&) = delete;
+      __basic_future& operator=(const __basic_future&) = delete;
 
-      bool has_value() const { return this->_M_state->has_value(); }
+      bool
+      valid() const noexcept { return static_cast<bool>(_M_state); }
 
-      void wait() const { this->_M_state->wait(); }
+      void
+      wait() const
+      {
+        _State_base::_S_check(_M_state);
+        _M_state->wait();
+      }
 
       template<typename _Rep, typename _Period>
-        bool
+        future_status
         wait_for(const chrono::duration<_Rep, _Period>& __rel) const
-        { return this->_M_state->wait_for(__rel); }
+        {
+          _State_base::_S_check(_M_state);
+          return _M_state->wait_for(__rel);
+        }
 
       template<typename _Clock, typename _Duration>
-        bool
+        future_status
         wait_until(const chrono::time_point<_Clock, _Duration>& __abs) const
-        { return this->_M_state->wait_until(__abs); }
+        {
+          _State_base::_S_check(_M_state);
+          return _M_state->wait_until(__abs);
+        }
 
     protected:
-      // wait for the state to be ready and rethrow any stored exception
-      _Future_result<_Result>&
+      /// Wait for the state to be ready and rethrow any stored exception
+      __result_type
       _M_get_result()
       {
-        _Future_result_base& __res = this->_M_state->wait();
+        _State_base::_S_check(_M_state);
+        _Result_base& __res = _M_state->wait();
         if (!(__res._M_error == 0))
           rethrow_exception(__res._M_error);
-        return static_cast<_Future_result<_Result>&>(__res);
+        return static_cast<__result_type>(__res);
       }
 
-      typedef shared_ptr<_Future_state> _State_ptr;
+      void _M_swap(__basic_future& __that) noexcept
+      {
+        _M_state.swap(__that._M_state);
+      }
 
-      // construction of a unique_future by promise::get_future()
+      // Construction of a future by promise::get_future()
       explicit
-      _Future_impl(const _State_ptr& __state)
-      : _M_state(__state)
+      __basic_future(const __state_type& __state) : _M_state(__state)
       {
-        if (static_cast<bool>(this->_M_state))
-          this->_M_state->_M_set_retrieved_flag();
-        else
-          __throw_future_error(int(future_errc::future_already_retrieved));
+        _State_base::_S_check(_M_state);
+        _M_state->_M_set_retrieved_flag();
       }
 
-      // copy construction from a shared_future
+      // Copy construction from a shared_future
+      explicit
+      __basic_future(const shared_future<_Res>&) noexcept;
+
+      // Move construction from a shared_future
       explicit
-      _Future_impl(const shared_future<_Result>&);
+      __basic_future(shared_future<_Res>&&) noexcept;
 
-      // move construction from a unique_future
+      // Move construction from a future
       explicit
-      _Future_impl(unique_future<_Result>&&);
+      __basic_future(future<_Res>&&) noexcept;
 
-      _State_ptr _M_state;
+      constexpr __basic_future() noexcept : _M_state() { }
+
+      struct _Reset
+      {
+        explicit _Reset(__basic_future& __fut) noexcept : _M_fut(__fut) { }
+        ~_Reset() { _M_fut._M_state.reset(); }
+        __basic_future& _M_fut;
+      };
     };
 
-  /// primary template for unique_future
-  template<typename _Result>
-    class unique_future : public _Future_impl<_Result>
+
+  /// Primary template for future.
+  template<typename _Res>
+    class future : public __basic_future<_Res>
     {
-      typedef _Move_future_result<_Result> _Mover;
+      friend class promise<_Res>;
+      template<typename> friend class packaged_task;
+      template<typename _Fn, typename... _Args>
+        friend future<typename result_of<_Fn(_Args...)>::type>
+        async(launch, _Fn&&, _Args&&...);
+
+      typedef __basic_future<_Res> _Base_type;
+      typedef typename _Base_type::__state_type __state_type;
+
+      explicit
+      future(const __state_type& __state) : _Base_type(__state) { }
 
     public:
+      constexpr future() noexcept : _Base_type() { }
+
       /// Move constructor
-      unique_future(unique_future&& __uf) : _Base_type(std::move(__uf)) { }
+      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
 
-      // disable copying
-      unique_future(const unique_future&) = delete;
-      unique_future& operator=(const unique_future&) = delete;
+      // Disable copying
+      future(const future&) = delete;
+      future& operator=(const future&) = delete;
 
-      // retrieving the value
-      typename _Mover::__rval_type
+      future& operator=(future&& __fut) noexcept
+      {
+        future(std::move(__fut))._M_swap(*this);
+        return *this;
+      }
+
+      /// Retrieving the value
+      _Res
       get()
-      { return _Mover::_S_move(this->_M_get_result()._M_value()); }
+      {
+        typename _Base_type::_Reset __reset(*this);
+        return std::move(this->_M_get_result()._M_value());
+      }
 
-    private:
-      typedef _Future_impl<_Result> _Base_type;
-      typedef typename _Base_type::_State_ptr _State_ptr;
+      shared_future<_Res> share();
+    };
+
+  /// Partial specialization for future<R&>
+  template<typename _Res>
+    class future<_Res&> : public __basic_future<_Res&>
+    {
+      friend class promise<_Res&>;
+      template<typename> friend class packaged_task;
+      template<typename _Fn, typename... _Args>
+        friend future<typename result_of<_Fn(_Args...)>::type>
+        async(launch, _Fn&&, _Args&&...);
 
-      friend class promise<_Result>;
+      typedef __basic_future<_Res&> _Base_type;
+      typedef typename _Base_type::__state_type __state_type;
 
       explicit
-      unique_future(const _State_ptr& __state) : _Base_type(__state) { }
-    };
-  // partial specialization for unique_future<R&>
-  template<typename _Result>
-    class unique_future<_Result&> : public _Future_impl<_Result&>
-    {
+      future(const __state_type& __state) : _Base_type(__state) { }
+
     public:
-      /// Move constructor
-      unique_future(unique_future&& __uf) : _Base_type(std::move(__uf)) { }
+      constexpr future() noexcept : _Base_type() { }
 
-      // disable copying
-      unique_future(const unique_future&) = delete;
-      unique_future& operator=(const unique_future&) = delete;
+      /// Move constructor
+      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
 
-      // retrieving the value
-      _Result& get() { return *this->_M_get_result()._M_value_ptr; }
+      // Disable copying
+      future(const future&) = delete;
+      future& operator=(const future&) = delete;
 
-    private:
-      typedef _Future_impl<_Result&>           _Base_type;
-      typedef typename _Base_type::_State_ptr _State_ptr;
+      future& operator=(future&& __fut) noexcept
+      {
+        future(std::move(__fut))._M_swap(*this);
+        return *this;
+      }
 
-      friend class promise<_Result&>;
+      /// Retrieving the value
+      _Res&
+      get()
+      {
+        typename _Base_type::_Reset __reset(*this);
+        return this->_M_get_result()._M_get();
+      }
 
-      explicit
-      unique_future(const _State_ptr& __state) : _Base_type(__state) { }
+      shared_future<_Res&> share();
     };
 
-  // specialization for unique_future<void>
+  /// Explicit specialization for future<void>
   template<>
-    class unique_future<void> : public _Future_impl<void>
+    class future<void> : public __basic_future<void>
     {
+      friend class promise<void>;
+      template<typename> friend class packaged_task;
+      template<typename _Fn, typename... _Args>
+        friend future<typename result_of<_Fn(_Args...)>::type>
+        async(launch, _Fn&&, _Args&&...);
+
+      typedef __basic_future<void> _Base_type;
+      typedef typename _Base_type::__state_type __state_type;
+
+      explicit
+      future(const __state_type& __state) : _Base_type(__state) { }
+
     public:
-      /// Move constructor
-      unique_future(unique_future&& __uf) : _Base_type(std::move(__uf)) { }
+      constexpr future() noexcept : _Base_type() { }
 
-      // disable copying
-      unique_future(const unique_future&) = delete;
-      unique_future& operator=(const unique_future&) = delete;
+      /// Move constructor
+      future(future&& __uf) noexcept : _Base_type(std::move(__uf)) { }
 
-      // retrieving the value
-      void get() { this->_M_get_result(); }
+      // Disable copying
+      future(const future&) = delete;
+      future& operator=(const future&) = delete;
 
-    private:
-      typedef _Future_impl<void> _Base_type;
-      typedef _Base_type::_State_ptr _State_ptr;
+      future& operator=(future&& __fut) noexcept
+      {
+        future(std::move(__fut))._M_swap(*this);
+        return *this;
+      }
 
-      friend class promise<void>;
+      /// Retrieving the value
+      void
+      get()
+      {
+        typename _Base_type::_Reset __reset(*this);
+        this->_M_get_result();
+      }
 
-      explicit
-      unique_future(const _State_ptr& __state) : _Base_type(__state) { }
+      shared_future<void> share();
     };
 
-  /// primary template for shared_future
-  template<typename _Result>
-    class shared_future : public _Future_impl<_Result>
+
+  /// Primary template for shared_future.
+  template<typename _Res>
+    class shared_future : public __basic_future<_Res>
     {
+      typedef __basic_future<_Res> _Base_type;
+
     public:
+      constexpr shared_future() noexcept : _Base_type() { }
+
       /// Copy constructor
       shared_future(const shared_future& __sf) : _Base_type(__sf) { }
 
-      /// Construct from a unique_future rvalue
-      shared_future(unique_future<_Result>&& __uf)
+      /// Construct from a future rvalue
+      shared_future(future<_Res>&& __uf) noexcept
       : _Base_type(std::move(__uf))
       { }
 
-      shared_future& operator=(const shared_future&) = delete;
+      /// Construct from a shared_future rvalue
+      shared_future(shared_future&& __sf) noexcept
+      : _Base_type(std::move(__sf))
+      { }
 
-      // retrieving the value
-      const _Result&
-      get()
-      { return this->_M_get_result()._M_value(); }
+      shared_future& operator=(const shared_future& __sf)
+      {
+        shared_future(__sf)._M_swap(*this);
+        return *this;
+      }
 
-    private:
-      typedef _Future_impl<_Result> _Base_type;
+      shared_future& operator=(shared_future&& __sf) noexcept
+      {
+        shared_future(std::move(__sf))._M_swap(*this);
+        return *this;
+      }
+
+      /// Retrieving the value
+      const _Res&
+      get()
+      {
+       typename _Base_type::__result_type __r = this->_M_get_result();
+       _Res& __rs(__r._M_value());
+       return __rs;
+      }
     };
-  // partial specialization for shared_future<R&>
-  template<typename _Result>
-    class shared_future<_Result&> : public _Future_impl<_Result&>
+
+  /// Partial specialization for shared_future<R&>
+  template<typename _Res>
+    class shared_future<_Res&> : public __basic_future<_Res&>
     {
+      typedef __basic_future<_Res&>           _Base_type;
+
     public:
+      constexpr shared_future() noexcept : _Base_type() { }
+
       /// Copy constructor
       shared_future(const shared_future& __sf) : _Base_type(__sf) { }
 
-      /// Construct from a unique_future rvalue
-      shared_future(unique_future<_Result&>&& __uf)
+      /// Construct from a future rvalue
+      shared_future(future<_Res&>&& __uf) noexcept
       : _Base_type(std::move(__uf))
       { }
 
-      shared_future& operator=(const shared_future&) = delete;
+      /// Construct from a shared_future rvalue
+      shared_future(shared_future&& __sf) noexcept
+      : _Base_type(std::move(__sf))
+      { }
 
-      // retrieving the value
-      _Result& get() { return *this->_M_get_result()._M_value_ptr; }
+      shared_future& operator=(const shared_future& __sf)
+      {
+        shared_future(__sf)._M_swap(*this);
+        return *this;
+      }
 
-    private:
-      typedef _Future_impl<_Result&>           _Base_type;
+      shared_future& operator=(shared_future&& __sf) noexcept
+      {
+        shared_future(std::move(__sf))._M_swap(*this);
+        return *this;
+      }
+
+      /// Retrieving the value
+      _Res&
+      get() { return this->_M_get_result()._M_get(); }
     };
 
-  // specialization for shared_future<void>
+  /// Explicit specialization for shared_future<void>
   template<>
-    class shared_future<void> : public _Future_impl<void>
+    class shared_future<void> : public __basic_future<void>
     {
+      typedef __basic_future<void> _Base_type;
+
     public:
+      constexpr shared_future() noexcept : _Base_type() { }
+
       /// Copy constructor
       shared_future(const shared_future& __sf) : _Base_type(__sf) { }
 
-      /// Construct from a unique_future rvalue
-      shared_future(unique_future<void>&& __uf)
+      /// Construct from a future rvalue
+      shared_future(future<void>&& __uf) noexcept
       : _Base_type(std::move(__uf))
       { }
 
-      shared_future& operator=(const shared_future&) = delete;
+      /// Construct from a shared_future rvalue
+      shared_future(shared_future&& __sf) noexcept
+      : _Base_type(std::move(__sf))
+      { }
 
-      // retrieving the value
-      void get() { this->_M_get_result(); }
+      shared_future& operator=(const shared_future& __sf)
+      {
+        shared_future(__sf)._M_swap(*this);
+        return *this;
+      }
 
-    private:
-      typedef _Future_impl<void> _Base_type;
-    };
+      shared_future& operator=(shared_future&& __sf) noexcept
+      {
+        shared_future(std::move(__sf))._M_swap(*this);
+        return *this;
+      }
 
-  // now we can define the protected _Future_impl constructors
+      // Retrieving the value
+      void
+      get() { this->_M_get_result(); }
+    };
 
-  template<typename _Result>
-    _Future_impl<_Result>::_Future_impl(const shared_future<_Result>& __sf)
+  // Now we can define the protected __basic_future constructors.
+  template<typename _Res>
+    inline __basic_future<_Res>::
+    __basic_future(const shared_future<_Res>& __sf) noexcept
     : _M_state(__sf._M_state)
     { }
 
-  template<typename _Result>
-    _Future_impl<_Result>::_Future_impl(unique_future<_Result>&& __uf)
+  template<typename _Res>
+    inline __basic_future<_Res>::
+    __basic_future(shared_future<_Res>&& __sf) noexcept
+    : _M_state(std::move(__sf._M_state))
+    { }
+
+  template<typename _Res>
+    inline __basic_future<_Res>::
+    __basic_future(future<_Res>&& __uf) noexcept
     : _M_state(std::move(__uf._M_state))
     { }
 
-  /// primary template for promise
-  template<typename _Result>
+  template<typename _Res>
+    inline shared_future<_Res>
+    future<_Res>::share()
+    { return shared_future<_Res>(std::move(*this)); }
+
+  template<typename _Res>
+    inline shared_future<_Res&>
+    future<_Res&>::share()
+    { return shared_future<_Res&>(std::move(*this)); }
+
+  inline shared_future<void>
+  future<void>::share()
+  { return shared_future<void>(std::move(*this)); }
+
+  /// Primary template for promise
+  template<typename _Res>
     class promise
     {
+      typedef __future_base::_State_base       _State;
+      typedef __future_base::_Result<_Res>     _Res_type;
+      typedef __future_base::_Ptr<_Res_type>   _Ptr_type;
+      template<typename, typename> friend class _State::_Setter;
+
+      shared_ptr<_State>                        _M_future;
+      _Ptr_type                                 _M_storage;
+
     public:
       promise()
-      : _M_future(std::make_shared<_Future_state>()),
-      _M_storage(new _Future_result<_Result>())
+      : _M_future(std::make_shared<_State>()),
+       _M_storage(new _Res_type())
       { }
 
-      promise(promise&& __rhs)
+      promise(promise&& __rhs) noexcept
       : _M_future(std::move(__rhs._M_future)),
-      _M_storage(std::move(__rhs._M_storage))
+       _M_storage(std::move(__rhs._M_storage))
       { }
 
-      // TODO: requires allocator concepts
-      /*
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
+        promise(allocator_arg_t, const _Allocator& __a)
+        : _M_future(std::allocate_shared<_State>(__a)),
+         _M_storage(__future_base::_S_allocate_result<_Res>(__a))
+        { }
 
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs);
-       */
+        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
+        : _M_future(std::move(__rhs._M_future)),
+         _M_storage(std::move(__rhs._M_storage))
+        { }
 
       promise(const promise&) = delete;
 
@@ -577,9 +965,9 @@ namespace std
           _M_future->_M_break_promise(std::move(_M_storage));
       }
 
-      // assignment
+      // Assignment
       promise&
-      operator=(promise&& __rhs)
+      operator=(promise&& __rhs) noexcept
       {
         promise(std::move(__rhs)).swap(*this);
         return *this;
@@ -588,73 +976,84 @@ namespace std
       promise& operator=(const promise&) = delete;
 
       void
-      swap(promise& __rhs)
+      swap(promise& __rhs) noexcept
       {
         _M_future.swap(__rhs._M_future);
         _M_storage.swap(__rhs._M_storage);
       }
 
-      // retrieving the result
-      unique_future<_Result>
+      // Retrieving the result
+      future<_Res>
       get_future()
-      { return unique_future<_Result>(_M_future); }
+      { return future<_Res>(_M_future); }
 
-      // setting the result
+      // Setting the result
       void
-      set_value(const _Result& __r)
+      set_value(const _Res& __r)
       {
-        if (!_M_satisfied())
-          _M_storage->_M_set(__r);
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(this, __r);
+        _M_future->_M_set_result(std::move(__setter));
       }
 
       void
-      set_value(_Result&& __r)
+      set_value(_Res&& __r)
       {
-        if (!_M_satisfied())
-          _M_storage->_M_set(_Mover::_S_move(__r));
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(this, std::move(__r));
+        _M_future->_M_set_result(std::move(__setter));
       }
 
       void
       set_exception(exception_ptr __p)
       {
-        if (!_M_satisfied())
-          _M_storage->_M_error = __p;
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(__p, this);
+        _M_future->_M_set_result(std::move(__setter));
       }
-
-    private:
-      template<typename> friend class packaged_task;
-      typedef _Move_future_result<_Result> _Mover;
-      bool _M_satisfied() { return !static_cast<bool>(_M_storage); }
-      shared_ptr<_Future_state>                           _M_future;
-      typename _Future_ptr<_Future_result<_Result>>::type _M_storage;
     };
 
-  // partial specialization for promise<R&>
-  template<typename _Result>
-    class promise<_Result&>
+  template<typename _Res>
+    inline void
+    swap(promise<_Res>& __x, promise<_Res>& __y) noexcept
+    { __x.swap(__y); }
+
+  template<typename _Res, typename _Alloc>
+    struct uses_allocator<promise<_Res>, _Alloc>
+    : public true_type { };
+
+
+  /// Partial specialization for promise<R&>
+  template<typename _Res>
+    class promise<_Res&>
     {
+      typedef __future_base::_State_base       _State;
+      typedef __future_base::_Result<_Res&>    _Res_type;
+      typedef __future_base::_Ptr<_Res_type>   _Ptr_type;
+      template<typename, typename> friend class _State::_Setter;
+
+      shared_ptr<_State>                        _M_future;
+      _Ptr_type                                 _M_storage;
+
     public:
       promise()
-      : _M_future(std::make_shared<_Future_state>()),
-      _M_storage(new _Future_result<_Result&>())
+      : _M_future(std::make_shared<_State>()),
+       _M_storage(new _Res_type())
       { }
 
-      promise(promise&& __rhs)
+      promise(promise&& __rhs) noexcept
       : _M_future(std::move(__rhs._M_future)),
-      _M_storage(std::move(__rhs._M_storage))
+       _M_storage(std::move(__rhs._M_storage))
       { }
 
-      // TODO: requires allocator concepts
-      /*
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
+        promise(allocator_arg_t, const _Allocator& __a)
+        : _M_future(std::allocate_shared<_State>(__a)),
+         _M_storage(__future_base::_S_allocate_result<_Res&>(__a))
+        { }
 
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs);
-       */
+        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
+        : _M_future(std::move(__rhs._M_future)),
+         _M_storage(std::move(__rhs._M_storage))
+        { }
 
       promise(const promise&) = delete;
 
@@ -664,9 +1063,9 @@ namespace std
           _M_future->_M_break_promise(std::move(_M_storage));
       }
 
-      // assignment
+      // Assignment
       promise&
-      operator=(promise&& __rhs)
+      operator=(promise&& __rhs) noexcept
       {
         promise(std::move(__rhs)).swap(*this);
         return *this;
@@ -675,64 +1074,67 @@ namespace std
       promise& operator=(const promise&) = delete;
 
       void
-      swap(promise& __rhs)
+      swap(promise& __rhs) noexcept
       {
         _M_future.swap(__rhs._M_future);
         _M_storage.swap(__rhs._M_storage);
       }
 
-      // retrieving the result
-      unique_future<_Result&>
+      // Retrieving the result
+      future<_Res&>
       get_future()
-      { return unique_future<_Result&>(_M_future); }
+      { return future<_Res&>(_M_future); }
 
-      // setting the result
+      // Setting the result
       void
-      set_value(_Result& __r)
+      set_value(_Res& __r)
       {
-        if (!_M_satisfied())
-          _M_storage->_M_value_ptr = &__r;
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(this, __r);
+        _M_future->_M_set_result(std::move(__setter));
       }
 
       void
       set_exception(exception_ptr __p)
       {
-        if (!_M_satisfied())
-          _M_storage->_M_error = __p;
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(__p, this);
+        _M_future->_M_set_result(std::move(__setter));
       }
-
-    private:
-      template<typename> friend class packaged_task;
-      bool _M_satisfied() { return !static_cast<bool>(_M_storage); }
-      shared_ptr<_Future_state>                             _M_future;
-      typename _Future_ptr<_Future_result<_Result&>>::type  _M_storage;
     };
 
-  // specialization for promise<void>
+  /// Explicit specialization for promise<void>
   template<>
     class promise<void>
     {
+      typedef __future_base::_State_base       _State;
+      typedef __future_base::_Result<void>     _Res_type;
+      typedef __future_base::_Ptr<_Res_type>   _Ptr_type;
+      template<typename, typename> friend class _State::_Setter;
+
+      shared_ptr<_State>                        _M_future;
+      _Ptr_type                                 _M_storage;
+
     public:
       promise()
-      : _M_future(std::make_shared<_Future_state>()),
-      _M_storage(new _Future_result<void>())
+      : _M_future(std::make_shared<_State>()),
+       _M_storage(new _Res_type())
       { }
 
-      promise(promise&& __rhs)
+      promise(promise&& __rhs) noexcept
       : _M_future(std::move(__rhs._M_future)),
-      _M_storage(std::move(__rhs._M_storage))
+       _M_storage(std::move(__rhs._M_storage))
       { }
 
-      // TODO: requires allocator concepts
-      /*
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
+        promise(allocator_arg_t, const _Allocator& __a)
+        : _M_future(std::allocate_shared<_State>(__a)),
+         _M_storage(__future_base::_S_allocate_result<void>(__a))
+        { }
 
       template<typename _Allocator>
-        promise(allocator_arg_t, const _Allocator&, promise&& __rhs);
-       */
+        promise(allocator_arg_t, const _Allocator&, promise&& __rhs)
+        : _M_future(std::move(__rhs._M_future)),
+         _M_storage(std::move(__rhs._M_storage))
+        { }
 
       promise(const promise&) = delete;
 
@@ -742,9 +1144,9 @@ namespace std
           _M_future->_M_break_promise(std::move(_M_storage));
       }
 
-      // assignment
+      // Assignment
       promise&
-      operator=(promise&& __rhs)
+      operator=(promise&& __rhs) noexcept
       {
         promise(std::move(__rhs)).swap(*this);
         return *this;
@@ -753,187 +1155,366 @@ namespace std
       promise& operator=(const promise&) = delete;
 
       void
-      swap(promise& __rhs)
+      swap(promise& __rhs) noexcept
       {
         _M_future.swap(__rhs._M_future);
         _M_storage.swap(__rhs._M_storage);
       }
 
-      // retrieving the result
-      unique_future<void>
+      // Retrieving the result
+      future<void>
       get_future()
-      { return unique_future<void>(_M_future); }
+      { return future<void>(_M_future); }
+
+      // Setting the result
+      void set_value();
 
-      // setting the result
       void
-      set_value()
+      set_exception(exception_ptr __p)
       {
-        _M_future->_M_set_result(std::move(_M_storage));
+        auto __setter = _State::__setter(__p, this);
+        _M_future->_M_set_result(std::move(__setter));
       }
+    };
 
-      void
-      set_exception(exception_ptr __p)
+  // set void
+  template<>
+    struct __future_base::_State_base::_Setter<void, void>
+    {
+      promise<void>::_Ptr_type operator()()
       {
-        if (!_M_satisfied())
-          _M_storage->_M_error = __p;
-        _M_future->_M_set_result(std::move(_M_storage));
+        _State_base::_S_check(_M_promise->_M_future);
+        return std::move(_M_promise->_M_storage);
       }
 
-    private:
-      template<typename> friend class packaged_task;
-      bool _M_satisfied() { return !static_cast<bool>(_M_storage); }
-      shared_ptr<_Future_state>                 _M_future;
-      _Future_ptr<_Future_result<void>>::type   _M_storage;
+      promise<void>*    _M_promise;
     };
 
-  // TODO: requires allocator concepts
-  /*
-  template<typename _Result, class Alloc>
-    concept_map UsesAllocator<promise<_Result>, Alloc>
+  inline __future_base::_State_base::_Setter<void, void>
+  __future_base::_State_base::__setter(promise<void>* __prom)
+  {
+    return _Setter<void, void>{ __prom };
+  }
+
+  inline void
+  promise<void>::set_value()
+  {
+    auto __setter = _State::__setter(this);
+    _M_future->_M_set_result(std::move(__setter));
+  }
+
+
+  template<typename _Ptr_type, typename _Res>
+    struct __future_base::_Task_setter
     {
-      typedef Alloc allocator_type;
-    }
-   */
+      _Ptr_type operator()()
+      {
+        __try
+         {
+           _M_result->_M_set(_M_fn());
+         }
+       __catch(...)
+         {
+           _M_result->_M_error = current_exception();
+         }
+        return std::move(_M_result);
+      }
+      _Ptr_type&                _M_result;
+      std::function<_Res()>     _M_fn;
+    };
 
-  template<typename _Result, typename... _ArgTypes>
-    struct _Run_task
+  template<typename _Ptr_type>
+    struct __future_base::_Task_setter<_Ptr_type, void>
     {
-      static void
-      _S_run(promise<_Result>& __p, function<_Result(_ArgTypes...)>& __f,
-          _ArgTypes... __args)
+      _Ptr_type operator()()
       {
-        __p.set_value(__f(std::forward<_ArgTypes>(__args)...));
+        __try
+         {
+           _M_fn();
+         }
+       __catch(...)
+         {
+           _M_result->_M_error = current_exception();
+         }
+       return std::move(_M_result);
       }
+      _Ptr_type&                _M_result;
+      std::function<void()>     _M_fn;
     };
 
-  // specialization used by packaged_task<void(...)>
-  template<typename... _ArgTypes>
-    struct _Run_task<void, _ArgTypes...>
+  template<typename _Res, typename... _Args>
+    struct __future_base::_Task_state<_Res(_Args...)> final
+    : __future_base::_State_base
     {
-      static void
-      _S_run(promise<void>& __p, function<void(_ArgTypes...)>& __f,
-          _ArgTypes... __args)
+      typedef _Res _Res_type;
+
+      _Task_state(std::function<_Res(_Args...)> __task)
+      : _M_result(new _Result<_Res>()), _M_task(std::move(__task))
+      { }
+
+      template<typename _Func, typename _Alloc>
+        _Task_state(_Func&& __task, const _Alloc& __a)
+        : _M_result(_S_allocate_result<_Res>(__a)),
+         _M_task(allocator_arg, __a, std::move(__task))
+        { }
+
+      void
+      _M_run(_Args... __args)
       {
-        __f(std::forward<_ArgTypes>(__args)...);
-        __p.set_value();
+        // bound arguments decay so wrap lvalue references
+       auto __boundfn = std::__bind_simple(std::ref(_M_task),
+           _S_maybe_wrap_ref(std::forward<_Args>(__args))...);
+        auto __setter = _S_task_setter(_M_result, std::move(__boundfn));
+        _M_set_result(std::move(__setter));
       }
+
+      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
+      _Ptr_type _M_result;
+      std::function<_Res(_Args...)> _M_task;
+
+      template<typename _Tp>
+        static reference_wrapper<_Tp>
+        _S_maybe_wrap_ref(_Tp& __t)
+        { return std::ref(__t); }
+
+      template<typename _Tp>
+        static typename enable_if<!is_lvalue_reference<_Tp>::value,
+                        _Tp>::type&&
+        _S_maybe_wrap_ref(_Tp&& __t)
+        { return std::forward<_Tp>(__t); }
     };
 
+  template<typename _Task, typename _Fn, bool
+           = is_same<_Task, typename decay<_Fn>::type>::value>
+    struct __constrain_pkgdtask
+    { typedef void __type; };
+
+  template<typename _Task, typename _Fn>
+    struct __constrain_pkgdtask<_Task, _Fn, true>
+    { };
+
   /// packaged_task
-  template<typename _Result, typename... _ArgTypes>
-    class packaged_task<_Result(_ArgTypes...)>
+  template<typename _Res, typename... _ArgTypes>
+    class packaged_task<_Res(_ArgTypes...)>
     {
-    public:
-      typedef _Result result_type;
-
-      // construction and destruction
-      packaged_task() { }
+      typedef __future_base::_Task_state<_Res(_ArgTypes...)>  _State_type;
+      shared_ptr<_State_type>                   _M_state;
 
-      template<typename _Fn>
-        explicit
-        packaged_task(const _Fn& __fn) : _M_task(__fn) { }
+    public:
+      // Construction and destruction
+      packaged_task() noexcept { }
 
-      template<typename _Fn>
+      template<typename _Allocator>
         explicit
-        packaged_task(_Fn&& __fn) : _M_task(std::move(__fn)) { }
-
-      explicit
-      packaged_task(_Result(*__fn)(_ArgTypes...)) : _M_task(__fn) { }
+        packaged_task(allocator_arg_t, const _Allocator& __a) noexcept
+        { }
 
-      // TODO: requires allocator concepts
-      /*
-      template<typename _Fn, typename _Allocator>
+      template<typename _Fn, typename = typename
+               __constrain_pkgdtask<packaged_task, _Fn>::__type>
         explicit
-        packaged_task(allocator_arg_t __tag, const _Allocator& __a, _Fn __fn)
-        : _M_task(__tag, __a, __fn), _M_promise(__tag, __a)
+        packaged_task(_Fn&& __fn)
+        : _M_state(std::make_shared<_State_type>(std::forward<_Fn>(__fn)))
         { }
 
-      template<typename _Fn, typename _Allocator>
+      template<typename _Fn, typename _Allocator, typename = typename
+               __constrain_pkgdtask<packaged_task, _Fn>::__type>
         explicit
-        packaged_task(allocator_arg_t __tag, const _Allocator& __a, _Fn&& __fn)
-        : _M_task(__tag, __a, std::move(__fn)), _M_promise(__tag, __a)
+        packaged_task(allocator_arg_t, const _Allocator& __a, _Fn&& __fn)
+        : _M_state(std::allocate_shared<_State_type>(__a,
+                                                     std::forward<_Fn>(__fn)))
         { }
-       */
 
-      ~packaged_task() = default;
+      ~packaged_task()
+      {
+        if (static_cast<bool>(_M_state) && !_M_state.unique())
+          _M_state->_M_break_promise(std::move(_M_state->_M_result));
+      }
+
+      // No copy
+      packaged_task(const packaged_task&) = delete;
+      packaged_task& operator=(const packaged_task&) = delete;
 
-      // no copy
-      packaged_task(packaged_task&) = delete;
-      packaged_task& operator=(packaged_task&) = delete;
+      template<typename _Allocator>
+        explicit
+        packaged_task(allocator_arg_t, const _Allocator&,
+                      const packaged_task&) = delete;
 
-      // move support
-      packaged_task(packaged_task&& __other)
+      // Move support
+      packaged_task(packaged_task&& __other) noexcept
       { this->swap(__other); }
 
-      packaged_task& operator=(packaged_task&& __other)
+      template<typename _Allocator>
+        explicit
+        packaged_task(allocator_arg_t, const _Allocator&,
+                      packaged_task&& __other) noexcept
+        { this->swap(__other); }
+
+      packaged_task& operator=(packaged_task&& __other) noexcept
       {
         packaged_task(std::move(__other)).swap(*this);
         return *this;
       }
 
       void
-      swap(packaged_task& __other)
-      {
-        _M_task.swap(__other._M_task);
-        _M_promise.swap(__other._M_promise);
-      }
+      swap(packaged_task& __other) noexcept
+      { _M_state.swap(__other._M_state); }
 
-      explicit operator bool() const { return static_cast<bool>(_M_task); }
+      bool
+      valid() const noexcept
+      { return static_cast<bool>(_M_state); }
 
-      // result retrieval
-      unique_future<_Result>
+      // Result retrieval
+      future<_Res>
       get_future()
+      { return future<_Res>(_M_state); }
+
+      // Execution
+      void
+      operator()(_ArgTypes... __args)
       {
-        __try
-        {
-          return _M_promise.get_future();
-        }
-        __catch (const future_error& __e)
-        {
-#ifdef __EXCEPTIONS
-          if (__e.code() == future_errc::future_already_retrieved)
-           throw std::bad_function_call();
-         throw;
-#endif
-        }
+        __future_base::_State_base::_S_check(_M_state);
+        _M_state->_M_run(std::forward<_ArgTypes>(__args)...);
       }
 
-      // execution
       void
-      operator()(_ArgTypes... __args)
+      reset()
       {
-        if (!static_cast<bool>(_M_task) || _M_promise._M_satisfied())
-         {
-#ifdef __EXCEPTIONS
-           throw std::bad_function_call();
+        __future_base::_State_base::_S_check(_M_state);
+        packaged_task(std::move(_M_state->_M_task)).swap(*this);
+      }
+    };
+
+  /// swap
+  template<typename _Res, typename... _ArgTypes>
+    inline void
+    swap(packaged_task<_Res(_ArgTypes...)>& __x,
+        packaged_task<_Res(_ArgTypes...)>& __y) noexcept
+    { __x.swap(__y); }
+
+  template<typename _Res, typename _Alloc>
+    struct uses_allocator<packaged_task<_Res>, _Alloc>
+    : public true_type { };
+
+
+  template<typename _BoundFn, typename _Res>
+    class __future_base::_Deferred_state final
+    : public __future_base::_State_base
+    {
+    public:
+      explicit
+      _Deferred_state(_BoundFn&& __fn)
+      : _M_result(new _Result<_Res>()), _M_fn(std::move(__fn))
+      { }
+
+    private:
+      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
+      _Ptr_type _M_result;
+      _BoundFn _M_fn;
+
+      virtual void
+      _M_run_deferred()
+      {
+        // safe to call multiple times so ignore failure
+        _M_set_result(_S_task_setter(_M_result, _M_fn), true);
+      }
+    };
+
+  class __future_base::_Async_state_common : public __future_base::_State_base
+  {
+  protected:
+#ifdef _GLIBCXX_ASYNC_ABI_COMPAT
+    ~_Async_state_common();
 #else
-           __builtin_abort();
+    ~_Async_state_common() = default;
 #endif
-         }
 
-        __try
-        {
-          _Run_task<_Result, _ArgTypes...>::_S_run(_M_promise, _M_task,
-              std::forward<_ArgTypes>(__args)...);
-        }
-        __catch (...)
-        {
-          _M_promise.set_exception(current_exception());
-        }
+    // Allow non-timed waiting functions to block until the thread completes,
+    // as if joined.
+    virtual void _M_run_deferred() { _M_join(); }
+
+    void _M_join() { std::call_once(_M_once, &thread::join, ref(_M_thread)); }
+
+    thread _M_thread;
+    once_flag _M_once;
+  };
+
+  template<typename _BoundFn, typename _Res>
+    class __future_base::_Async_state_impl final
+    : public __future_base::_Async_state_common
+    {
+    public:
+      explicit
+      _Async_state_impl(_BoundFn&& __fn)
+      : _M_result(new _Result<_Res>()), _M_fn(std::move(__fn))
+      {
+       _M_thread = std::thread{ [this] {
+         _M_set_result(_S_task_setter(_M_result, _M_fn));
+        } };
       }
 
-      void reset() { promise<_Result>().swap(_M_promise); }
+      ~_Async_state_impl() { _M_join(); }
 
     private:
-      function<_Result(_ArgTypes...)>   _M_task;
-      promise<_Result>                  _M_promise;
+      typedef __future_base::_Ptr<_Result<_Res>> _Ptr_type;
+      _Ptr_type _M_result;
+      _BoundFn _M_fn;
     };
 
+  template<typename _BoundFn>
+    inline std::shared_ptr<__future_base::_State_base>
+    __future_base::_S_make_deferred_state(_BoundFn&& __fn)
+    {
+      typedef typename remove_reference<_BoundFn>::type __fn_type;
+      typedef _Deferred_state<__fn_type> __state_type;
+      return std::make_shared<__state_type>(std::move(__fn));
+    }
+
+  template<typename _BoundFn>
+    inline std::shared_ptr<__future_base::_State_base>
+    __future_base::_S_make_async_state(_BoundFn&& __fn)
+    {
+      typedef typename remove_reference<_BoundFn>::type __fn_type;
+      typedef _Async_state_impl<__fn_type> __state_type;
+      return std::make_shared<__state_type>(std::move(__fn));
+    }
+
+
+  /// async
+  template<typename _Fn, typename... _Args>
+    future<typename result_of<_Fn(_Args...)>::type>
+    async(launch __policy, _Fn&& __fn, _Args&&... __args)
+    {
+      typedef typename result_of<_Fn(_Args...)>::type result_type;
+      std::shared_ptr<__future_base::_State_base> __state;
+      if ((__policy & (launch::async|launch::deferred)) == launch::async)
+       {
+         __state = __future_base::_S_make_async_state(std::__bind_simple(
+              std::forward<_Fn>(__fn), std::forward<_Args>(__args)...));
+       }
+      else
+       {
+         __state = __future_base::_S_make_deferred_state(std::__bind_simple(
+              std::forward<_Fn>(__fn), std::forward<_Args>(__args)...));
+       }
+      return future<result_type>(__state);
+    }
+
+  /// async, potential overload
+  template<typename _Fn, typename... _Args>
+    inline typename
+    __async_sfinae_helper<typename decay<_Fn>::type, _Fn, _Args...>::type
+    async(_Fn&& __fn, _Args&&... __args)
+    {
+      return async(launch::async|launch::deferred, std::forward<_Fn>(__fn),
+                  std::forward<_Args>(__args)...);
+    }
+
 #endif // _GLIBCXX_HAS_GTHREADS && _GLIBCXX_USE_C99_STDINT_TR1
-       // && _GLIBCXX_ATOMIC_BUILTINS_4
+       // && ATOMIC_INT_LOCK_FREE
 
   // @} group futures
-}
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
 
 #endif // __GXX_EXPERIMENTAL_CXX0X__