2
0
mirror of https://github.com/boostorg/thread.git synced 2026-02-02 09:22:10 +00:00

Merge branch 'develop' into fix/make_executors_copyable

This commit is contained in:
Vicente J. Botet Escriba
2015-04-18 07:11:12 +02:00
36 changed files with 611 additions and 240 deletions

View File

@@ -28,6 +28,10 @@
#include <string>
#include <iostream>
boost::future<void> p(boost::future<void>) {
return boost::make_ready_future();
}
void p1()
{
// std::cout << BOOST_CONTEXTOF << std::endl;
@@ -191,4 +195,16 @@ int test_executor_adaptor()
int main()
{
return test_executor_adaptor();
#if defined BOOST_THREAD_PROVIDES_FUTURE_CONTINUATION \
&& defined BOOST_THREAD_PROVIDES_EXECUTORS \
&& ! defined BOOST_NO_CXX11_RVALUE_REFERENCES
// compiles
boost::make_ready_future().then(&p);
boost::basic_thread_pool executor;
// doesn't compile
boost::make_ready_future().then(executor, &p);
#endif
}