From a61f5281bff11126c2cbf295dee507fc99d0a948 Mon Sep 17 00:00:00 2001
From: Nitin Bhat <nbhat4@illinois.edu>
Date: Mon, 3 Jul 2017 08:52:59 -0700
Subject: [PATCH] Disallow implicit conversions in CkRdmaWrapper constructors

Change-Id: I914b598106bd808b71fbdab25513dff779d2121f
---
 src/ck-core/ckrdmawrapper.h          | 2 +-
 src/libs/ck-libs/ampi/ampiOneSided.C | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ck-core/ckrdmawrapper.h b/src/ck-core/ckrdmawrapper.h
index 4a45aaf7d5..b668c993b6 100644
--- a/src/ck-core/ckrdmawrapper.h
+++ b/src/ck-core/ckrdmawrapper.h
@@ -26,7 +26,7 @@ class CkRdmaWrapper{
   CkRdmaWrapper() : ptr(NULL), callback(NULL) {
     srcPe = -1;
   }
-  CkRdmaWrapper(const void *address) : ptr(address){
+  explicit CkRdmaWrapper(const void *address) : ptr(address){
     srcPe = CkMyPe();
     callback = new CkCallback(CkCallback::ignore);
   }
diff --git a/src/libs/ck-libs/ampi/ampiOneSided.C b/src/libs/ck-libs/ampi/ampiOneSided.C
index 128fe050ce..12683276eb 100644
--- a/src/libs/ck-libs/ampi/ampiOneSided.C
+++ b/src/libs/ck-libs/ampi/ampiOneSided.C
@@ -429,7 +429,7 @@ int ampi::winGetAccumulate(const void *orgaddr, int orgcnt, MPI_Datatype orgtype
     else
 #endif
     {
-      msg = thisProxy[rank].winRemoteGetAccumulate(orgtotalsize, orgaddr, orgcnt, orgtype, targdisp,
+      msg = thisProxy[rank].winRemoteGetAccumulate(orgtotalsize, rdma(orgaddr), orgcnt, orgtype, targdisp,
                                                    targcnt, targtype, op, win->index);
     }
   }
-- 
2.11.4.GIT