diff --git a/example/cpp11/asymmetric/await_emu.cpp b/example/cpp11/asymmetric/await_emu.cpp index 4cabff2..cbc1c2a 100644 --- a/example/cpp11/asymmetric/await_emu.cpp +++ b/example/cpp11/asymmetric/await_emu.cpp @@ -48,7 +48,7 @@ public: void push(U &&u) { boost::lock_guard l(m); - q.push( forward(u) ); + q.push( boost::forward(u) ); c.notify_one(); } void pop(T &result) diff --git a/include/boost/coroutine/asymmetric_coroutine.hpp b/include/boost/coroutine/asymmetric_coroutine.hpp index 549cf62..aada349 100644 --- a/include/boost/coroutine/asymmetric_coroutine.hpp +++ b/include/boost/coroutine/asymmetric_coroutine.hpp @@ -479,7 +479,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -507,7 +507,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -535,7 +535,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -563,7 +563,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -869,7 +869,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -897,7 +897,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -925,7 +925,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -953,7 +953,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -1255,7 +1255,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -1283,7 +1283,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -1311,7 +1311,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -1339,7 +1339,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); impl_->pull(); } @@ -1522,7 +1522,7 @@ push_coroutine< Arg >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1550,7 +1550,7 @@ push_coroutine< Arg >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1577,7 +1577,7 @@ push_coroutine< Arg & >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1605,7 +1605,7 @@ push_coroutine< Arg & >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1631,7 +1631,7 @@ inline push_coroutine< void >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1658,7 +1658,7 @@ push_coroutine< void >::push_coroutine( coroutine_fn fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } # endif @@ -1686,7 +1686,7 @@ push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1714,7 +1714,7 @@ push_coroutine< Arg >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1742,7 +1742,7 @@ push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1770,7 +1770,7 @@ push_coroutine< Arg & >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1797,7 +1797,7 @@ push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -1824,7 +1824,7 @@ push_coroutine< void >::push_coroutine( BOOST_RV_REF( Fn) fn, BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } #else diff --git a/include/boost/coroutine/detail/pull_coroutine_object.hpp b/include/boost/coroutine/detail/pull_coroutine_object.hpp index acc9a57..cfe34bd 100644 --- a/include/boost/coroutine/detail/pull_coroutine_object.hpp +++ b/include/boost/coroutine/detail/pull_coroutine_object.hpp @@ -98,7 +98,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -186,7 +186,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -274,7 +274,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) diff --git a/include/boost/coroutine/detail/push_coroutine_object.hpp b/include/boost/coroutine/detail/push_coroutine_object.hpp index 1a0aa7e..1a39c07 100644 --- a/include/boost/coroutine/detail/push_coroutine_object.hpp +++ b/include/boost/coroutine/detail/push_coroutine_object.hpp @@ -110,7 +110,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -198,7 +198,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -286,7 +286,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) diff --git a/include/boost/coroutine/detail/setup.hpp b/include/boost/coroutine/detail/setup.hpp index a776029..35f601a 100644 --- a/include/boost/coroutine/detail/setup.hpp +++ b/include/boost/coroutine/detail/setup.hpp @@ -41,7 +41,7 @@ struct setup coroutine_context * caller_, coroutine_context * callee_, attributes const& attr_) : - fn( forward< Fn >( fn_) ), + fn( boost::forward< Fn >( fn_) ), caller( caller_), callee( callee_), attr( attr_) @@ -58,7 +58,7 @@ struct setup #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn( fn_), #else - fn( forward< Fn >( fn_) ), + fn( boost::forward< Fn >( fn_) ), #endif caller( caller_), callee( callee_), diff --git a/include/boost/coroutine/detail/symmetric_coroutine_call.hpp b/include/boost/coroutine/detail/symmetric_coroutine_call.hpp index a695795..a499275 100644 --- a/include/boost/coroutine/detail/symmetric_coroutine_call.hpp +++ b/include/boost/coroutine/detail/symmetric_coroutine_call.hpp @@ -75,7 +75,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -100,7 +100,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } # endif @@ -125,7 +125,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -150,7 +150,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } #else @@ -335,7 +335,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -360,7 +360,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } # endif @@ -385,7 +385,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -410,7 +410,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } #else @@ -595,7 +595,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -620,7 +620,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< coroutine_fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } # endif @@ -645,7 +645,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } @@ -670,7 +670,7 @@ public: BOOST_ASSERT( 0 < internal_stack_ctx.size); // placement new for internal coroutine impl_ = new ( internal_stack_ctx.sp) object_t( - forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); + boost::forward< Fn >( fn), attrs, stack_ctx, internal_stack_ctx, stack_alloc); BOOST_ASSERT( impl_); } #else diff --git a/include/boost/coroutine/detail/symmetric_coroutine_object.hpp b/include/boost/coroutine/detail/symmetric_coroutine_object.hpp index c7516f9..a1c0c05 100644 --- a/include/boost/coroutine/detail/symmetric_coroutine_object.hpp +++ b/include/boost/coroutine/detail/symmetric_coroutine_object.hpp @@ -74,7 +74,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -155,7 +155,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc) @@ -236,7 +236,7 @@ public: #ifdef BOOST_NO_CXX11_RVALUE_REFERENCES fn_( fn), #else - fn_( forward< Fn >( fn) ), + fn_( boost::forward< Fn >( fn) ), #endif stack_ctx_( stack_ctx), stack_alloc_( stack_alloc)