boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-01-23 18:12:12 +00:00
Code Issues Projects Releases Wiki Activity

unwrapped future must forward the continuation to the wrapped future. Related to #10964.

Browse Source
This commit is contained in:
Vicente J. Botet Escriba
2015-02-01 14:56:52 +01:00
parent cf539064d6
commit 45510facc7
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/thread/future.hpp
View File

@@ -195,7 +195,7 @@ namespace boost
} }
#endif #endif
#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION #if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock) virtual void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock)
{ {
continuation_ptr= continuation; continuation_ptr= continuation;
if (done) { if (done) {
@@ -4718,6 +4718,15 @@ namespace detail
boost::unique_lock<boost::mutex> lk(this->mutex); boost::unique_lock<boost::mutex> lk(this->mutex);
return parent_value(lk).get(); return parent_value(lk).get();
} }
#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION
typedef shared_ptr<shared_state_base> continuation_ptr_type;
virtual void set_continuation_ptr(continuation_ptr_type continuation, boost::unique_lock<boost::mutex>& lock)
{
boost::unique_lock<boost::mutex> lk(parent.future_->mutex);
parent.future_->set_continuation_ptr(continuation, lk);
}
#endif
}; };
template <class F, class Rp> template <class F, class Rp>

9
test/test_10964.cpp
View File

@@ -29,6 +29,10 @@ struct TestCallback
} }
}; };
void p1()
{
}
int main() int main()
{ {
#if ! defined BOOST_NO_CXX11_DECLTYPE && ! defined BOOST_NO_CXX11_AUTO_DECLARATIONS #if ! defined BOOST_NO_CXX11_DECLTYPE && ! defined BOOST_NO_CXX11_AUTO_DECLARATIONS
@@ -62,6 +66,11 @@ int main()
TestCallback()).unwrap().then(TestCallback()).get(); TestCallback()).unwrap().then(TestCallback()).get();
} }
std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl; std::cout << __FILE__ << "[" << __LINE__ << "]" << std::endl;
{
boost::future<void> f = boost::async(p1);
f.then(
TestCallback()).unwrap().then(TestCallback()).get();
}
#endif #endif
return 0; return 0;
} }