Boost logo

Boost-Commit :

Date view Thread view Subject view Author view

Subject: [Boost-commit] svn:boost r69011 - in sandbox/async/boost/async: . typeof
From: vicente.botet_at_[hidden]
Date: 2011-02-18 18:30:08

Author: viboes
Date: 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
New Revision: 69011
URL: http://svn.boost.org/trac/boost/changeset/69011

Log:
Async
Text files modified:
   sandbox/async/boost/async/act_traits.hpp | 2 +-
   sandbox/async/boost/async/fork.hpp | 2 +-
   sandbox/async/boost/async/fork_after.hpp | 2 +-
   sandbox/async/boost/async/future_traits.hpp | 2 +-
   sandbox/async/boost/async/immediate.hpp | 6 ++++--
   sandbox/async/boost/async/launcher.hpp | 6 ++++--
   sandbox/async/boost/async/lazy_fork.hpp | 2 +-
   sandbox/async/boost/async/scheduler.hpp | 2 +-
   sandbox/async/boost/async/threader.hpp | 6 ++++--
   sandbox/async/boost/async/typeof/future.hpp | 2 +-
   sandbox/async/boost/async/wait_for_all.hpp | 2 +-
   sandbox/async/boost/async/wait_for_any.hpp | 2 +-
   12 files changed, 21 insertions(+), 15 deletions(-)

Modified: sandbox/async/boost/async/act_traits.hpp
==============================================================================
--- sandbox/async/boost/async/act_traits.hpp (original)
+++ sandbox/async/boost/async/act_traits.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -16,7 +16,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/type_traits/is_fundamental.hpp>
 #include <boost/type_traits/is_convertible.hpp>

Modified: sandbox/async/boost/async/fork.hpp
==============================================================================
--- sandbox/async/boost/async/fork.hpp (original)
+++ sandbox/async/boost/async/fork.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -16,7 +16,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/async/act_traits.hpp>
 
 #include <boost/config/abi_prefix.hpp>

Modified: sandbox/async/boost/async/fork_after.hpp
==============================================================================
--- sandbox/async/boost/async/fork_after.hpp (original)
+++ sandbox/async/boost/async/fork_after.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -17,7 +17,7 @@
 #include <boost/bind.hpp>
 #include <boost/ref.hpp>
 #include <boost/utility/result_of.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/async/fork.hpp>
 #include <boost/async/algorithm/wait_all.hpp>
 

Modified: sandbox/async/boost/async/future_traits.hpp
==============================================================================
--- sandbox/async/boost/async/future_traits.hpp (original)
+++ sandbox/async/boost/async/future_traits.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -16,7 +16,7 @@
 
 #include <boost/async/act_traits.hpp>
 #include <boost/thread/detail/move.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/type_traits/is_fundamental.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 #include <boost/mpl/if.hpp>

Modified: sandbox/async/boost/async/immediate.hpp
==============================================================================
--- sandbox/async/boost/async/immediate.hpp (original)
+++ sandbox/async/boost/async/immediate.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -15,7 +15,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <boost/thread/detail/move.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 
 #include <boost/async/algorithm.hpp>
@@ -49,7 +49,9 @@
         unique_future<result_type> act(tsk.get_future());
         tsk();
 #endif
- return boost::move(act);
+ //return boost::move(act);
+ boost::detail::thread_move_t<boost::unique_future<result_type> > m(act);
+ return unique_future<result_type>(m);
     }
 
 };

Modified: sandbox/async/boost/async/launcher.hpp
==============================================================================
--- sandbox/async/boost/async/launcher.hpp (original)
+++ sandbox/async/boost/async/launcher.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -16,7 +16,7 @@
 
 #include <boost/thread/detail/move.hpp>
 #include <boost/thread/thread.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 
 #include <boost/async/algorithm.hpp>
@@ -56,7 +56,9 @@
 #else
         thread th(boost::move(tsk));
 #endif
- return boost::move(act);
+// return boost::move(act);
+ boost::detail::thread_move_t<boost::unique_future<result_type> > m(act);
+ return unique_future<result_type>(m);
     }
 
 };

Modified: sandbox/async/boost/async/lazy_fork.hpp
==============================================================================
--- sandbox/async/boost/async/lazy_fork.hpp (original)
+++ sandbox/async/boost/async/lazy_fork.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -15,7 +15,7 @@
 #include <boost/bind.hpp>
 #include <boost/utility/result_of.hpp>
 #include <boost/async/act_traits.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 
 #include <boost/config/abi_prefix.hpp>
 

Modified: sandbox/async/boost/async/scheduler.hpp
==============================================================================
--- sandbox/async/boost/async/scheduler.hpp (original)
+++ sandbox/async/boost/async/scheduler.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -19,7 +19,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/tp/pool.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 
 #include <boost/async/algorithm.hpp>

Modified: sandbox/async/boost/async/threader.hpp
==============================================================================
--- sandbox/async/boost/async/threader.hpp (original)
+++ sandbox/async/boost/async/threader.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -21,7 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 
 #include <boost/async/fork.hpp>
@@ -337,7 +337,9 @@
 #else
         unique_joiner<result_type> unique_joiner_(f);
 #endif
- return boost::move(unique_joiner_);
+// return boost::move(unique_joiner_);
+ boost::detail::thread_move_t<unique_joiner<result_type> > m(unique_joiner_);
+ return unique_joiner<result_type>(m);
     }
 
 };

Modified: sandbox/async/boost/async/typeof/future.hpp
==============================================================================
--- sandbox/async/boost/async/typeof/future.hpp (original)
+++ sandbox/async/boost/async/typeof/future.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -14,7 +14,7 @@
 #ifndef BOOST_ASYNC_TYPEOF_FUTURE__HPP
 #define BOOST_ASYNC_TYPEOF_FUTURE__HPP
 
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/typeof/typeof.hpp>
 
 #include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()

Modified: sandbox/async/boost/async/wait_for_all.hpp
==============================================================================
--- sandbox/async/boost/async/wait_for_all.hpp (original)
+++ sandbox/async/boost/async/wait_for_all.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -17,7 +17,7 @@
 #include <boost/async/fork_all.hpp>
 #include <boost/async/algorithm/get_all.hpp>
 #include <boost/fusion/include/tuple.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 
 #include <boost/config/abi_prefix.hpp>

Modified: sandbox/async/boost/async/wait_for_any.hpp
==============================================================================
--- sandbox/async/boost/async/wait_for_any.hpp (original)
+++ sandbox/async/boost/async/wait_for_any.hpp 2011-02-18 18:30:06 EST (Fri, 18 Feb 2011)
@@ -17,7 +17,7 @@
 #include <boost/async/algorithm/get.hpp>
 #include <boost/async/fork_all.hpp>
 #include <boost/fusion/include/tuple.hpp>
-#include <boost/futures/future.hpp>
+#include <boost/thread/future.hpp>
 #include <boost/utility/result_of.hpp>
 #include <boost/type_traits/remove_reference.hpp>
 #include <exception>

Date view Thread view Subject view Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk