mirror of
https://github.com/boostorg/coroutine2.git
synced 2025-05-09 15:14:01 +00:00
Merge branch 'develop'
This commit is contained in:
commit
51390c0346
@ -67,7 +67,8 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
|
||||
// set termination flags
|
||||
state |= state_t::complete;
|
||||
// jump back
|
||||
return std::move( other->c).resume();
|
||||
other->c = std::move( other->c).resume();
|
||||
return std::move( other->c);
|
||||
},
|
||||
std::forward< Fn >( fn) ) },
|
||||
#else
|
||||
@ -189,7 +190,8 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
|
||||
// set termination flags
|
||||
state |= state_t::complete;
|
||||
// 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) ) },
|
||||
#else
|
||||
|
@ -31,7 +31,7 @@ project boost/coroutine2/test
|
||||
rule configure-impl ( properties * )
|
||||
{
|
||||
local result ;
|
||||
if ( <target-os>darwin in $(properties) )
|
||||
if ( <target-os>darwin in $(properties) || <target-os>android in $(properties) )
|
||||
{
|
||||
result = <build>no ;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user