#276: active: decay tuple elements properly

DARMA-tasking · Jan 18, 2023 · cb28d28 · cb28d28
1 parent f7cab16
commit cb28d28
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/vt/messaging/active.h b/src/vt/messaging/active.h
@@ -767,7 +767,7 @@ struct ActiveMessenger : runtime::component::PollableComponent<ActiveMessenger>
    */
   template <auto f, typename... Params>
   PendingSendType send(NodeType dest, Params&&... params) {
-    using Tuple = typename std::decay<std::tuple<Params...>>::type;
+    using Tuple = DecayTuple<std::tuple<Params...>>;
     using MsgT = ParamMsg<Tuple>;
     auto msg = vt::makeMessage<MsgT>(std::forward<Params>(params)...);
     auto han = auto_registry::makeAutoHandlerParam<decltype(f),f,Params...>();

diff --git a/src/vt/messaging/param_msg.h b/src/vt/messaging/param_msg.h
@@ -67,6 +67,14 @@ struct ParamMsg : vt::Message {
   }
 };
 
+
+template <typename... Params>
+constexpr auto decayTypes(std::tuple<Params...> const&)
+  -> std::tuple<std::remove_cv_t<std::remove_reference_t<Params>>...>;
+
+template <typename T>
+using DecayTuple = decltype(decayTypes(std::declval<T>()));
+
 }} /* end namespace vt::messaging */
 
 #endif /*INCLUDED_VT_MESSAGING_PARAM_MSG_H*/
diff --git a/src/vt/registry/auto/auto_registry_general.h b/src/vt/registry/auto/auto_registry_general.h
@@ -159,7 +159,7 @@ template <typename F, F f, typename... Params>
 struct FunctorAdapterParam {
   using FunctionPtrType = F;
   using ObjType = SentinelObject;
-  using MsgType = messaging::ParamMsg<std::tuple<Params...>>;
+  using MsgType = messaging::ParamMsg<messaging::DecayTuple<std::tuple<Params...>>>;
 
   static constexpr FunctionPtrType getFunction() { return f; }