From 2838e2d8e2cd82c7c72d02ee14bab98f992f65e7 Mon Sep 17 00:00:00 2001 From: Oliver Kowalke Date: Sun, 6 Dec 2015 21:19:44 +0100 Subject: [PATCH] do_invoke() renamed to apply() --- include/boost/fiber/context.hpp | 4 ++-- include/boost/fiber/future/detail/task_object.hpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp index bb2adba1..e42961fb 100644 --- a/include/boost/fiber/context.hpp +++ b/include/boost/fiber/context.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include @@ -294,7 +294,7 @@ public: } auto fn = std::move( fn_); auto tpl = std::move( tpl_); - boost::context::detail::do_invoke( fn, tpl); + boost::context::detail::apply( fn, tpl); } catch ( fiber_interrupted const&) { } // terminate context diff --git a/include/boost/fiber/future/detail/task_object.hpp b/include/boost/fiber/future/detail/task_object.hpp index bef91dfc..999bcf96 100644 --- a/include/boost/fiber/future/detail/task_object.hpp +++ b/include/boost/fiber/future/detail/task_object.hpp @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include @@ -41,7 +41,7 @@ public: void run( Args && ... args) override final { try { this->set_value( - boost::context::detail::do_invoke( + boost::context::detail::apply( fn_, std::make_tuple( std::forward< Args >( args) ... ) ) ); } catch (...) { this->set_exception( std::current_exception() ); @@ -78,7 +78,7 @@ public: void run( Args && ... args) override final { try { - boost::context::detail::do_invoke( + boost::context::detail::apply( fn_, std::make_tuple( std::forward< Args >( args) ... ) ); this->set_value(); } catch (...) {