* include/std/future (__async_sfinae_helper): Remove.

From-SVN: r194567

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 93332d12b6bb66ba19fdb9b6c4cf07c4842fdd3d..1f30031fd78201818bced6d34a3eb5f3f3a70145 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2012-12-17  Jonathan Wakely  <jwakely.gcc@gmail.com>
+
+       * include/std/future (__async_sfinae_helper): Remove.
+
 2012-12-16  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * src/c++11/thread.cc (execute_native_thread_routine): Do not swallow

diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index c24ab77d108263c083052106c0467a301d7085c5..2ecf438fc1e311fd915a1e53a761a5ac961520e6 100644 (file)
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -170,19 +170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     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 future<typename result_of<_Fn(_Args...)>::type> type;
-    };
-
   template<typename _Fn, typename... _Args>
-    struct __async_sfinae_helper<launch, _Fn, _Args...>
-    { };
-
-  template<typename _Fn, typename... _Args>
-    typename
-    __async_sfinae_helper<typename decay<_Fn>::type, _Fn, _Args...>::type
+    future<typename result_of<_Fn(_Args...)>::type>
     async(_Fn&& __fn, _Args&&... __args);
 
 #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) \
@@ -1509,8 +1498,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
   /// async, potential overload
   template<typename _Fn, typename... _Args>
-    inline typename
-    __async_sfinae_helper<typename decay<_Fn>::type, _Fn, _Args...>::type
+    inline future<typename result_of<_Fn(_Args...)>::type>
     async(_Fn&& __fn, _Args&&... __args)
     {
       return async(launch::async|launch::deferred, std::forward<_Fn>(__fn),