From 95ff3ea51258aa9ad4c9fd28e2f3ac1b9b02fb8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?=
 <cezary.skrzynski@ng-analytics.com>
Date: Tue, 22 Dec 2020 20:24:18 +0100
Subject: [PATCH] #1186: backport: add explicit types to templates

Cherry-pick 8f27e08 from #908.
---
 tests/perf/ping_pong.cc                    | 10 +++++-----
 tests/unit/pool/test_pool_message_sizes.cc |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/perf/ping_pong.cc b/tests/perf/ping_pong.cc
index 1f0d4efd28..acd4a6f548 100644
--- a/tests/perf/ping_pong.cc
+++ b/tests/perf/ping_pong.cc
@@ -105,7 +105,7 @@ static void finishedPing(FinishedPingMsg<num_bytes>* msg) {
 
   if (num_bytes != max_bytes) {
     auto pmsg = makeSharedMessage<PingMsg<num_bytes * 2>>();
-    theMsg()->sendMsg<PingMsg<num_bytes * 2>, pingPong>(
+    theMsg()->sendMsg<PingMsg<num_bytes * 2>, pingPong<num_bytes * 2>>(
       pong_node, pmsg
     );
   }
@@ -133,7 +133,7 @@ static void pingPong(PingMsg<num_bytes>* in_msg) {
 
   if (cnt >= num_pings) {
     auto msg = makeSharedMessage<FinishedPingMsg<num_bytes>>(num_bytes);
-    theMsg()->sendMsg<FinishedPingMsg<num_bytes>, finishedPing>(
+    theMsg()->sendMsg<FinishedPingMsg<num_bytes>, finishedPing<num_bytes>>(
       0, msg
     );
   } else {
@@ -141,12 +141,12 @@ static void pingPong(PingMsg<num_bytes>* in_msg) {
       theContext()->getNode() == ping_node ? pong_node : ping_node;
     #if REUSE_MESSAGE_PING_PONG
       // @todo: fix this memory allocation problem
-      theMsg()->sendMsg<PingMsg<num_bytes>, pingPong>(
+      theMsg()->sendMsg<PingMsg<num_bytes>, pingPong<num_bytes>>(
         next, in_msg, [=]{ /*delete in_msg;*/ }
       );
     #else
       auto m = makeSharedMessage<PingMsg<num_bytes>>(cnt + 1);
-      theMsg()->sendMsg<PingMsg<num_bytes>, pingPong>(next, m);
+      theMsg()->sendMsg<PingMsg<num_bytes>, pingPong<num_bytes>>(next, m);
     #endif
   }
 }
@@ -169,7 +169,7 @@ int main(int argc, char** argv) {
 
   if (my_node == 0) {
     auto m = makeSharedMessage<PingMsg<min_bytes>>();
-    theMsg()->sendMsg<PingMsg<min_bytes>, pingPong>(pong_node, m);
+    theMsg()->sendMsg<PingMsg<min_bytes>, pingPong<min_bytes>>(pong_node, m);
   }
 
   while (!rt->isTerminated()) {
diff --git a/tests/unit/pool/test_pool_message_sizes.cc b/tests/unit/pool/test_pool_message_sizes.cc
index 69bc114d02..d0746f419b 100644
--- a/tests/unit/pool/test_pool_message_sizes.cc
+++ b/tests/unit/pool/test_pool_message_sizes.cc
@@ -102,12 +102,12 @@ void TestPoolMessageSizes::testPoolFun(TestMsg<num_bytes>* prev_msg) {
 
   if (count < max_test_count) {
     auto msg = makeSharedMessage<TestMsg<num_bytes>>();
-    theMsg()->sendMsg<TestMsg<num_bytes>, testPoolFun>(
+    theMsg()->sendMsg<TestMsg<num_bytes>, testPoolFun<num_bytes>>(
       next, msg
     );
   } else {
     auto msg = makeSharedMessage<TestMsg<num_bytes * 2>>();
-    theMsg()->sendMsg<TestMsg<num_bytes * 2>, testPoolFun>(
+    theMsg()->sendMsg<TestMsg<num_bytes * 2>, testPoolFun<num_bytes * 2>>(
       next, msg
     );
     count = 0;