diff options
| author | Jonathan Wakely <jwakely.gcc@gmail.com> | 2012-12-17 21:30:51 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2012-12-17 21:30:51 +0000 |
| commit | 92b8bccecb541a4bff552312104fb784c336a1fc (patch) | |
| tree | f5f4ad4a6f50ab801ae2f1b1ce3d1011bda54e3b | |
| parent | a57bf4070aa7f8e11bf4659ae52169fed1585605 (diff) | |
| download | gcc-92b8bccecb541a4bff552312104fb784c336a1fc.zip gcc-92b8bccecb541a4bff552312104fb784c336a1fc.tar.gz gcc-92b8bccecb541a4bff552312104fb784c336a1fc.tar.bz2 | |
* include/std/future (__async_sfinae_helper): Remove.
From-SVN: r194567
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/future | 16 |
2 files changed, 6 insertions, 14 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 93332d1..1f30031 100644 --- 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 c24ab77..2ecf438 100644 --- 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), |