OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

From-SVN: r194567
This commit is contained in:
Jonathan Wakely 2012-12-17 21:30:51 +00:00 committed by Jonathan Wakely
parent a57bf4070a
commit 92b8bccecb
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -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

16
libstdc++-v3/include/std/future
View File

@ -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),