From 68f80530593c3909f8811c19f273fb4f313d6795 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Mon, 28 Sep 2015 18:47:59 +0200 Subject: [PATCH] use do_invoke() --- include/boost/fiber/context.hpp | 2 +- include/boost/fiber/future/detail/task_object.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp index 09e1338f..40b2e788 100644 --- a/include/boost/fiber/context.hpp +++ b/include/boost/fiber/context.hpp @@ -273,7 +273,7 @@ public: ctx(); // check for unwinding if ( ! unwinding_requested() ) { - boost::context::detail::invoke_helper( fn, std::move( tpl) ); + boost::context::detail::do_invoke( fn, std::move( tpl) ); } } catch ( fiber_interrupted const&) { } catch ( forced_unwind const&) { diff --git a/include/boost/fiber/future/detail/task_object.hpp b/include/boost/fiber/future/detail/task_object.hpp index ac191f5b..003ba69e 100644 --- a/include/boost/fiber/future/detail/task_object.hpp +++ b/include/boost/fiber/future/detail/task_object.hpp @@ -40,7 +40,7 @@ public: void run( Args && ... args) { try { this->set_value( - boost::context::detail::invoke_helper( + boost::context::detail::do_invoke( std::move( fn_), std::make_tuple( std::forward< Args >( args) ... ) ) ); } catch (...) { this->set_exception( std::current_exception() ); @@ -77,7 +77,7 @@ public: void run( Args && ... args) { try { - boost::context::detail::invoke_helper( + boost::context::detail::do_invoke( std::move( fn_), std::make_tuple( std::forward< Args >( args) ... ) ); this->set_value(); } catch (...) {