Adding boost::result_of support for bind

Fixing minor problems related to it. Fixes #383
STEllAR-GROUP · Feb 13, 2013 · 59aeee1 · 59aeee1
1 parent 06b45e3
commit 59aeee1
Show file tree

Hide file tree

Showing 8 changed files with 10,273 additions and 342 deletions.
diff --git a/hpx/lcos/local/packaged_continuation.hpp b/hpx/lcos/local/packaged_continuation.hpp
@@ -460,7 +460,7 @@ namespace hpx { namespace lcos
         typedef lcos::detail::continuation_base<result_type> cont_impl_type;
         boost::intrusive_ptr<cont_impl_type> p(
             detail::make_continuation_base<result_type, Result>(
-                util::bind(boost::forward<F>(f), util::placeholders::_1)));
+                util::bind(util::protect(boost::forward<F>(f)), util::placeholders::_1)));
 
         // bind an on_completed handler to this future which will invoke the
         // continuation
@@ -481,7 +481,7 @@ namespace hpx { namespace lcos
         typedef lcos::detail::continuation_base<result_type> cont_impl_type;
         boost::intrusive_ptr<cont_impl_type> p(
             detail::make_continuation_base<result_type, void>(
-                util::bind(boost::forward<F>(f), util::placeholders::_1)));
+                util::bind(util::protect(boost::forward<F>(f)), util::placeholders::_1)));
 
         // bind an on_completed handler to this future which will invoke the
         // continuation