From def227f1ad99a7d366cda7ed72e748ebfb3bf797 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 13 Feb 2017 13:13:29 +0000 Subject: PR libstdc++/79486 use lvalues in result_of expressions PR libstdc++/79486 * include/std/future (__future_base::_Task_state::_M_run) (__future_base::_Task_state::_M_run_delayed): Use lvalue types in result_of expressions. * testsuite/30_threads/packaged_task/79486.cc: New. From-SVN: r245386 --- libstdc++-v3/include/std/future | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libstdc++-v3/include/std') diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index 6351d7e..cb53561 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -1416,7 +1416,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION virtual void _M_run(_Args&&... __args) { - auto __boundfn = [&] () -> typename result_of<_Fn(_Args&&...)>::type { + auto __boundfn = [&] () -> typename result_of<_Fn&(_Args&&...)>::type { return std::__invoke(_M_impl._M_fn, std::forward<_Args>(__args)...); }; this->_M_set_result(_S_task_setter(this->_M_result, __boundfn)); @@ -1425,7 +1425,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION virtual void _M_run_delayed(_Args&&... __args, weak_ptr<_State_base> __self) { - auto __boundfn = [&] () -> typename result_of<_Fn(_Args&&...)>::type { + auto __boundfn = [&] () -> typename result_of<_Fn&(_Args&&...)>::type { return std::__invoke(_M_impl._M_fn, std::forward<_Args>(__args)...); }; this->_M_set_delayed_result(_S_task_setter(this->_M_result, __boundfn), -- cgit v1.1