From 65d5852aa4125b8ac20b7c140b5399053c0be44d Mon Sep 17 00:00:00 2001
From: Maurizio Drocco <maurizio.drocco@pnnl.gov>
Date: Sat, 9 Feb 2019 09:29:41 -0800
Subject: [PATCH] [alpha-unito/gam#54] explicit one-argument GlobalPointer
 constructor

---
 include/gam/Context.hpp       | 6 +++---
 include/gam/GlobalPointer.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/gam/Context.hpp b/include/gam/Context.hpp
index 0c35728..384a498 100644
--- a/include/gam/Context.hpp
+++ b/include/gam/Context.hpp
@@ -579,7 +579,7 @@ class Context {
         /*
          * destroy and un-bind committed memory
          */
-        unmap(a);
+        unmap(p);
     } else
       forward_dec(p);
   }
@@ -734,7 +734,7 @@ class Context {
           case daemon_pointer::RC_DEC:
             LOGLN("DMN recv -1 %llu from %lu", a, p.from);
             assert(ctx.view.author(a) == ctx.rank());
-            if (ctx.mc.rc_dec(a) == 0) ctx.unmap(a);
+            if (ctx.mc.rc_dec(a) == 0) ctx.unmap(p.p);
             break;
           case daemon_pointer::RC_GET: {
             LOGLN("DMN recv RC_GET %llu from %lu", a, p.from);
@@ -747,7 +747,7 @@ class Context {
             LOGLN("DMN recv PVT -1 %llu from %lu", a, p.from);
             assert(ctx.view.author(a) == ctx.rank_);
             assert(ctx.view.committed(a) != nullptr);
-            ctx.unmap(a);
+            ctx.unmap(p.p);
             break;
           case daemon_pointer::RLOAD:
             LOGLN("DMN recv RLOAD %llu from %lu", a, p.from);
diff --git a/include/gam/GlobalPointer.hpp b/include/gam/GlobalPointer.hpp
index 9568c00..f56ffde 100644
--- a/include/gam/GlobalPointer.hpp
+++ b/include/gam/GlobalPointer.hpp
@@ -62,7 +62,7 @@ class GlobalPointer {
 
   GlobalPointer() {}
 
-  GlobalPointer(uint64_t descriptor) : descriptor_(descriptor) {}
+  explicit GlobalPointer(uint64_t descriptor) : descriptor_(descriptor) {}
 
   GlobalPointer(executor_id home, uint64_t lsb)
       : GlobalPointer(lsb | ((uint64_t)home << 32)) {