Merge branch 'develop'

This commit is contained in:
Oliver Kowalke 2015-09-05 07:56:52 +02:00
commit aac0261dae
2 changed files with 6 additions and 6 deletions

View File

@ -35,7 +35,7 @@ pull_coroutine< T >::control_block::control_block( context::preallocated palloc,
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized push_coroutine< T > // create synthesized push_coroutine< T >
typename push_coroutine< T >::control_block synthesized_cb( this); typename push_coroutine< T >::control_block synthesized_cb( this);
push_coroutine< T > synthesized( & synthesized_cb); push_coroutine< T > synthesized( & synthesized_cb);
@ -110,7 +110,7 @@ pull_coroutine< T & >::control_block::control_block( context::preallocated pallo
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized push_coroutine< T > // create synthesized push_coroutine< T >
typename push_coroutine< T & >::control_block synthesized_cb( this); typename push_coroutine< T & >::control_block synthesized_cb( this);
push_coroutine< T & > synthesized( & synthesized_cb); push_coroutine< T & > synthesized( & synthesized_cb);
@ -184,7 +184,7 @@ pull_coroutine< void >::control_block::control_block( context::preallocated pall
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized push_coroutine< T > // create synthesized push_coroutine< T >
typename push_coroutine< void >::control_block synthesized_cb( this); typename push_coroutine< void >::control_block synthesized_cb( this);
push_coroutine< void > synthesized( & synthesized_cb); push_coroutine< void > synthesized( & synthesized_cb);

View File

@ -36,7 +36,7 @@ push_coroutine< T >::control_block::control_block( context::preallocated palloc,
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized pull_coroutine< T > // create synthesized pull_coroutine< T >
typename pull_coroutine< T >::control_block synthesized_cb( this); typename pull_coroutine< T >::control_block synthesized_cb( this);
pull_coroutine< T > synthesized( & synthesized_cb); pull_coroutine< T > synthesized( & synthesized_cb);
@ -134,7 +134,7 @@ push_coroutine< T & >::control_block::control_block( context::preallocated pallo
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized pull_coroutine< T > // create synthesized pull_coroutine< T >
typename pull_coroutine< T & >::control_block synthesized_cb( this); typename pull_coroutine< T & >::control_block synthesized_cb( this);
pull_coroutine< T & > synthesized( & synthesized_cb); pull_coroutine< T & > synthesized( & synthesized_cb);
@ -209,7 +209,7 @@ push_coroutine< void >::control_block::control_block( context::preallocated pall
other( nullptr), other( nullptr),
caller( boost::context::execution_context::current() ), caller( boost::context::execution_context::current() ),
callee( palloc, salloc, callee( palloc, salloc,
[=,fn=std::forward< Fn >( fn_)] () mutable -> decltype( auto) { [=,fn=std::forward< Fn >( fn_)] () mutable -> void {
// create synthesized pull_coroutine< T > // create synthesized pull_coroutine< T >
typename pull_coroutine< void >::control_block synthesized_cb( this); typename pull_coroutine< void >::control_block synthesized_cb( this);
pull_coroutine< void > synthesized( & synthesized_cb); pull_coroutine< void > synthesized( & synthesized_cb);