From 3172c9aa3b431541bf596c795fe3d2716fc3da54 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Mon, 20 Apr 2015 19:35:12 -0500
Subject: [PATCH] Added missing typename, missing class key, and missing
 include

---
 hpx/util/detail/function_template.hpp     | 1 +
 hpx/util/functional/colocated_helpers.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hpx/util/detail/function_template.hpp b/hpx/util/detail/function_template.hpp
index 50d77136e425..6212034a6f7b 100644
--- a/hpx/util/detail/function_template.hpp
+++ b/hpx/util/detail/function_template.hpp
@@ -11,6 +11,7 @@
 #include <hpx/config.hpp>
 #include <hpx/runtime/serialization/serialize.hpp>
 #include <hpx/traits/is_callable.hpp>
+#include <hpx/traits/serialize_as_future.hpp>
 #include <hpx/util/detail/basic_function.hpp>
 #include <hpx/util/detail/function_registration.hpp>
 #include <hpx/util/detail/vtable/callable_vtable.hpp>
diff --git a/hpx/util/functional/colocated_helpers.hpp b/hpx/util/functional/colocated_helpers.hpp
index 66d2e2056e61..2f50eb7ad735 100644
--- a/hpx/util/functional/colocated_helpers.hpp
+++ b/hpx/util/functional/colocated_helpers.hpp
@@ -123,7 +123,7 @@ namespace hpx { namespace util { namespace functional
 
             HPX_SERIALIZATION_SPLIT_MEMBER();
 
-            friend traits::serialize_as_future<apply_continuation_impl>;
+            friend struct traits::serialize_as_future<apply_continuation_impl>;
 
             bound_type bound_;
             actions::continuation_type cont_;
@@ -158,7 +158,7 @@ namespace hpx { namespace traits
         static void
         call(util::functional::detail::apply_continuation_impl<Bound>& b)
         {
-            typedef util::functional::detail::apply_continuation_impl<
+            typedef typename util::functional::detail::apply_continuation_impl<
                     Bound
                 >::bound_type bound_type;
             traits::serialize_as_future<bound_type>::call(b.bound_);
@@ -250,7 +250,7 @@ namespace hpx { namespace util { namespace functional
 
             HPX_SERIALIZATION_SPLIT_MEMBER();
 
-            friend traits::serialize_as_future<async_continuation_impl>;
+            friend struct traits::serialize_as_future<async_continuation_impl>;
 
             bound_type bound_;
             actions::continuation_type cont_;
@@ -285,7 +285,7 @@ namespace hpx { namespace traits
         static void
         call(util::functional::detail::async_continuation_impl<Bound>& b)
         {
-            typedef util::functional::detail::async_continuation_impl<
+            typedef typename util::functional::detail::async_continuation_impl<
                     Bound
                 >::bound_type bound_type;
             traits::serialize_as_future<bound_type>::call(b.bound_);