From 31dc65b24ad32c7cb49d70017fa1cd88c722764d Mon Sep 17 00:00:00 2001
From: Jonathan Lifflander <jliffla@sandia.gov>
Date: Tue, 14 Feb 2023 16:16:59 -0700
Subject: [PATCH] #2092: location: call function pointer directly

---
 src/vt/topos/location/location.h      | 4 ++--
 src/vt/topos/location/location.impl.h | 6 +++---
 src/vt/vrt/collection/manager.impl.h  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/vt/topos/location/location.h b/src/vt/topos/location/location.h
index 1e465e0e34..941a6601fe 100644
--- a/src/vt/topos/location/location.h
+++ b/src/vt/topos/location/location.h
@@ -248,7 +248,7 @@ struct EntityLocationCoord : LocationCoord {
    *
    * \param[in] m message shared pointer
    */
-  template <typename MessageT>
+  template <typename MessageT, ActiveTypedFnType<MessageT> *f>
   void routePreparedMsgHandler(MsgSharedPtr<MessageT> const& msg);
 
   /**
@@ -264,7 +264,7 @@ struct EntityLocationCoord : LocationCoord {
    *
    * \param[in] m message shared pointer
    */
-  template <typename MessageT>
+  template <typename MessageT, ActiveTypedFnType<MessageT> *f>
   void routeMsgHandlerLocal(MsgSharedPtr<MessageT> const& msg);
 
   /**
diff --git a/src/vt/topos/location/location.impl.h b/src/vt/topos/location/location.impl.h
index 7ffeaa7efa..8757dcec18 100644
--- a/src/vt/topos/location/location.impl.h
+++ b/src/vt/topos/location/location.impl.h
@@ -663,14 +663,14 @@ void EntityLocationCoord<EntityID>::routeMsgHandler(
 }
 
 template <typename EntityID>
-template <typename MessageT>
+template <typename MessageT, ActiveTypedFnType<MessageT> *f>
 void EntityLocationCoord<EntityID>::routePreparedMsgHandler(
   MsgSharedPtr<MessageT> const& msg
 ) {
   if (local_registered_.find(msg->getEntity()) == local_registered_.end()) {
     return routePreparedMsg(msg);
   } else {
-    return routeMsgHandlerLocal(msg);
+    return routeMsgHandlerLocal<MessageT, f>(msg);
   }
 }
 
@@ -698,7 +698,7 @@ void EntityLocationCoord<EntityID>::setupMessageForRouting(
 }
 
 template <typename EntityID>
-template <typename MessageT>
+template <typename MessageT, ActiveTypedFnType<MessageT> *f>
 void EntityLocationCoord<EntityID>::routeMsgHandlerLocal(
   MsgSharedPtr<MessageT> const& msg
 ) {
diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h
index c9a75f56ee..9132992568 100644
--- a/src/vt/vrt/collection/manager.impl.h
+++ b/src/vt/vrt/collection/manager.impl.h
@@ -1168,7 +1168,7 @@ messaging::PendingSend CollectionManager::sendMsgUntypedHandler(
     msg, [](MsgSharedPtr<BaseMsgType>& inner_msg){
       auto typed_msg = inner_msg.template to<MsgT>();
       auto lm2 = theLocMan()->getCollectionLM<IdxT>(typed_msg->getLocInst());
-      lm2->template routePreparedMsgHandler<MsgT>(typed_msg);
+      lm2->template routePreparedMsgHandler<MsgT, collectionMsgTypedHandler<ColT,IdxT,MsgT>>(typed_msg);
     }
   };
 }