boost/fiber
2
0
Fork 0
mirror of https://github.com/boostorg/fiber.git synced 2026-02-20 14:42:21 +00:00
Code Issues Projects Releases Wiki Activity

pass ecv2 as universal reference to context-fn

Browse Source
This commit is contained in:
Oliver Kowalke
2016-10-07 19:53:23 +02:00
parent 95555e5a07
commit 1d3fa0583d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/fiber/context.hpp
View File

@@ -194,7 +194,7 @@ private:
#else
template< typename Fn, typename Tpl >
boost::context::execution_context< detail::data_t * >
run_( boost::context::execution_context< detail::data_t * > ctx, Fn && fn_, Tpl && tpl_, detail::data_t * dp) noexcept {
run_( boost::context::execution_context< detail::data_t * > && ctx, Fn && fn_, Tpl && tpl_, detail::data_t * dp) noexcept {
{
// fn and tpl must be destroyed before calling set_terminated()
typename std::decay< Fn >::type fn = std::forward< Fn >( fn_);
@@ -336,8 +336,8 @@ public:
ctx_{ std::allocator_arg, palloc, salloc,
detail::wrap(
[this]( typename std::decay< Fn >::type & fn, typename std::decay< Tpl >::type & tpl,
boost::context::execution_context< detail::data_t * > ctx, detail::data_t * dp) mutable noexcept {
return run_( std::move( ctx), std::move( fn), std::move( tpl), dp);
boost::context::execution_context< detail::data_t * > && ctx, detail::data_t * dp) mutable noexcept {
return run_( std::forward< boost::context::execution_context< detail::data_t * > >( ctx), std::move( fn), std::move( tpl), dp);
},
std::forward< Fn >( fn),
std::forward< Tpl >( tpl) )}
@@ -345,8 +345,8 @@ public:
# else
ctx_{ std::allocator_arg, palloc, salloc,
[this,fn=detail::decay_copy( std::forward< Fn >( fn) ),tpl=std::forward< Tpl >( tpl)]
(boost::context::execution_context< detail::data_t * > ctx, detail::data_t * dp) mutable noexcept {
return run_( std::move( ctx), std::move( fn), std::move( tpl), dp);
(boost::context::execution_context< detail::data_t * > && ctx, detail::data_t * dp) mutable noexcept {
return run_( std::forward< boost::context::execution_context< detail::data_t * > >( ctx), std::move( fn), std::move( tpl), dp);
}}
# endif
#endif

7
include/boost/fiber/detail/wrap.hpp
View File

@@ -87,10 +87,13 @@ public:
wrapper & operator=( wrapper && other) = default;
boost::context::execution_context< data_t * >
operator()( boost::context::execution_context< data_t * > ctx, data_t * dp) {
operator()( boost::context::execution_context< data_t * > && ctx, data_t * dp) {
return boost::context::detail::invoke(
std::move( fn1_),
fn2_, tpl_, std::move( ctx), dp);
fn2_,
tpl_,
std::forward< boost::context::execution_context< data_t * > >( ctx),
dp);
}
};