ref #11192- boost::future<>::then() with an executor doesn't compile …

…when the callback returns a future
Romain-Geissler-1A · Apr 17, 2015 · 45c9a1d · 45c9a1d
1 parent 0d8ddfe
commit 45c9a1d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/example/executor.cpp b/example/executor.cpp
@@ -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;
@@ -147,4 +151,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
 }
diff --git a/include/boost/thread/future.hpp b/include/boost/thread/future.hpp
@@ -1420,7 +1420,7 @@ namespace boost
 
 
         typedef typename base_type::move_dest_type move_dest_type;
-    public: // when_all
+    public: //  // todo move to private and add the needed friends (when_all, executors, ...)
 
         BOOST_THREAD_FUTURE(future_ptr a_future):
           base_type(a_future)
@@ -1626,12 +1626,13 @@ namespace boost
 
             typedef typename base_type::move_dest_type move_dest_type;
 
+        public: // todo move to private and add the needed friends
+
             BOOST_THREAD_FUTURE(future_ptr a_future):
               base_type(a_future)
             {
             }
 
-        public:
             BOOST_THREAD_MOVABLE_ONLY(BOOST_THREAD_FUTURE)
             typedef future_state::state state;
             typedef R value_type; // EXTENSION