From 05bb801f25bf887af54195fbedc6a1416375aa8a Mon Sep 17 00:00:00 2001
From: Jonathan Lifflander <jliffla@sandia.gov>
Date: Wed, 29 Nov 2023 13:38:05 -0800
Subject: [PATCH] #2212: callback: stop using CBTrait for params which misses
 the MsgProps

---
 src/vt/pipe/callback/cb_union/cb_raw_base.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/vt/pipe/callback/cb_union/cb_raw_base.h b/src/vt/pipe/callback/cb_union/cb_raw_base.h
index f5ecec165a..36d2c3f5a6 100644
--- a/src/vt/pipe/callback/cb_union/cb_raw_base.h
+++ b/src/vt/pipe/callback/cb_union/cb_raw_base.h
@@ -232,8 +232,7 @@ struct CallbackTyped : CallbackRawBaseSingle {
 
   template <typename... Params>
   void sendTuple(std::tuple<Params...> tup) {
-    using Trait = CBTraits<Args...>;
-    using MsgT = messaging::ParamMsg<typename Trait::TupleType>;
+    using MsgT = messaging::ParamMsg<std::tuple<std::decay_t<Params>...>>;
     auto msg = vt::makeMessage<MsgT>();
     msg->setParams(std::move(tup));
     CallbackRawBaseSingle::sendMsg<MsgT>(msg);
@@ -243,7 +242,7 @@ struct CallbackTyped : CallbackRawBaseSingle {
   void send(Params&&... params) {
     using Trait = CBTraits<Args...>;
     if constexpr (std::is_same_v<typename Trait::MsgT, NoMsg>) {
-      using MsgT = messaging::ParamMsg<typename Trait::TupleType>;
+      using MsgT = messaging::ParamMsg<std::tuple<std::decay_t<Params>...>>;
       auto msg = vt::makeMessage<MsgT>();
       msg->setParams(std::forward<Params>(params)...);
       CallbackRawBaseSingle::sendMsg<MsgT>(msg);