diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 93332d12b6b..1f30031fd78 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2012-12-17 Jonathan Wakely + + * include/std/future (__async_sfinae_helper): Remove. + 2012-12-16 Jonathan Wakely * 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 c24ab77d108..2ecf438fc1e 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -170,19 +170,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION future::type> async(launch __policy, _Fn&& __fn, _Args&&... __args); - template - struct __async_sfinae_helper - { - typedef future::type> type; - }; - template - struct __async_sfinae_helper - { }; - - template - typename - __async_sfinae_helper::type, _Fn, _Args...>::type + future::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 - inline typename - __async_sfinae_helper::type, _Fn, _Args...>::type + inline future::type> async(_Fn&& __fn, _Args&&... __args) { return async(launch::async|launch::deferred, std::forward<_Fn>(__fn),