From f28fe069e111348da3b00bc0d333f0b042b32014 Mon Sep 17 00:00:00 2001
From: Phil Miller <pbmille@sandia.gov>
Date: Fri, 4 Dec 2020 16:10:13 -0500
Subject: [PATCH] #728: Adjust syntax to avoid confusing nvcc

---
 src/vt/collective/reduce/reduce.h           | 8 ++++----
 src/vt/objgroup/proxy/proxy_objgroup.h      | 4 ++--
 src/vt/vrt/collection/reducable/reducable.h | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/vt/collective/reduce/reduce.h b/src/vt/collective/reduce/reduce.h
index ccd7a60a3e..8ef5437a33 100644
--- a/src/vt/collective/reduce/reduce.h
+++ b/src/vt/collective/reduce/reduce.h
@@ -109,7 +109,7 @@ struct Reduce : virtual collective::tree::Tree {
       return reduce<
         OpT,
         MsgT,
-        MsgT::template msgHandler<
+        &MsgT::template msgHandler<
           MsgT,
           OpT,
           collective::reduce::operators::ReduceCallback<MsgT>
@@ -151,7 +151,7 @@ struct Reduce : virtual collective::tree::Tree {
     return reduceImmediate<
       OpT,
       MsgT,
-      MsgT::template msgHandler<
+      &MsgT::template msgHandler<
         MsgT,
         OpT,
         collective::reduce::operators::ReduceCallback<MsgT>
@@ -195,7 +195,7 @@ struct Reduce : virtual collective::tree::Tree {
       OpT,
       FunctorT,
       MsgT,
-      MsgT::template msgHandler<MsgT, OpT, FunctorT>
+      &MsgT::template msgHandler<MsgT, OpT, FunctorT>
       >(root, msg, id, num_contrib);
   }
 
@@ -235,7 +235,7 @@ struct Reduce : virtual collective::tree::Tree {
       OpT,
       FunctorT,
       MsgT,
-      MsgT::template msgHandler<MsgT, OpT, FunctorT>
+      &MsgT::template msgHandler<MsgT, OpT, FunctorT>
       >(root, msg, id, num_contrib);
   }
 
diff --git a/src/vt/objgroup/proxy/proxy_objgroup.h b/src/vt/objgroup/proxy/proxy_objgroup.h
index 4ee44ed090..efba69e1da 100644
--- a/src/vt/objgroup/proxy/proxy_objgroup.h
+++ b/src/vt/objgroup/proxy/proxy_objgroup.h
@@ -109,7 +109,7 @@ struct Proxy {
       OpT,
       MsgPtrT,
       MsgT,
-      MsgT::template msgHandler<
+      &MsgT::template msgHandler<
         MsgT, OpT, collective::reduce::operators::ReduceCallback<MsgT>
         >
       >(msg, cb, stamp);
@@ -136,7 +136,7 @@ struct Proxy {
       FunctorT,
       MsgPtrT,
       MsgT,
-      MsgT::template msgHandler<MsgT, OpT, FunctorT>
+      &MsgT::template msgHandler<MsgT, OpT, FunctorT>
       >(msg, stamp);
   }
 
diff --git a/src/vt/vrt/collection/reducable/reducable.h b/src/vt/vrt/collection/reducable/reducable.h
index ebe4cde9ef..1104f80897 100644
--- a/src/vt/vrt/collection/reducable/reducable.h
+++ b/src/vt/vrt/collection/reducable/reducable.h
@@ -87,7 +87,7 @@ struct Reducable : BaseProxyT {
     return reduce<
       OpT,
       MsgT,
-      MsgT::template msgHandler<
+      &MsgT::template msgHandler<
         MsgT, OpT, collective::reduce::operators::ReduceCallback<MsgT>
         >
       >(msg, cb, stamp);
@@ -111,7 +111,7 @@ struct Reducable : BaseProxyT {
       OpT,
       FunctorT,
       MsgT,
-      MsgT::template msgHandler<MsgT, OpT, FunctorT>
+      &MsgT::template msgHandler<MsgT, OpT, FunctorT>
       >(msg, stamp);
   }