boost_mirror/coroutine2
1
0
Fork 0
mirror of https://github.com/boostorg/coroutine2.git synced 2025-05-09 23:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Oliver Kowalke 2018-02-19 16:03:45 +01:00
commit 51390c0346
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/coroutine2/detail/push_control_block_cc.ipp
View File

@ -67,7 +67,8 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
// set termination flags // set termination flags
state |= state_t::complete; state |= state_t::complete;
// jump back // jump back
return std::move( other->c).resume(); other->c = std::move( other->c).resume();
return std::move( other->c);
}, },
std::forward< Fn >( fn) ) }, std::forward< Fn >( fn) ) },
#else #else
@ -190,6 +191,7 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
state |= state_t::complete; state |= state_t::complete;
// jump back // jump back
other->c = std::move( other->c).resume(); other->c = std::move( other->c).resume();
return std::move( other->c);
}, },
std::forward< Fn >( fn) ) }, std::forward< Fn >( fn) ) },
#else #else

2
test/Jamfile.v2
View File

@ -31,7 +31,7 @@ project boost/coroutine2/test
rule configure-impl ( properties * ) rule configure-impl ( properties * )
{ {
local result ; local result ;
if ( <target-os>darwin in $(properties) ) if ( <target-os>darwin in $(properties) || <target-os>android in $(properties) )
{ {
result = <build>no ; result = <build>no ;
} }