Fixing left-over member access to client_base

STEllAR-GROUP · Mar 26, 2016 · 52f49a0 · 52f49a0
1 parent a604a61
commit 52f49a0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/tests/unit/agas/components/managed_refcnt_checker.hpp b/tests/unit/agas/components/managed_refcnt_checker.hpp
@@ -43,19 +43,23 @@ struct managed_refcnt_monitor
     explicit managed_refcnt_monitor(
         naming::gid_type const& locality
         )
-      : locality_(naming::get_locality_from_gid(locality)
+      : base_type(), flag_(),
+        locality_(naming::get_locality_from_gid(locality)
                 , naming::id_type::unmanaged)
     {
-        gid_ = stub_type::create_async(locality_, flag_.get_id());
+        static_cast<base_type&>(*this) =
+            stub_type::create_async(locality_, flag_.get_id());
     }
 
     /// Create a new component on the target locality.
     explicit managed_refcnt_monitor(
         naming::id_type const& locality
         )
-      : locality_(naming::get_locality_from_id(locality))
+      : base_type(), flag_(),
+        locality_(naming::get_locality_from_id(locality))
     {
-        gid_ = stub_type::create_async(locality_, flag_.get_id());
+        static_cast<base_type&>(*this) =
+            stub_type::create_async(locality_, flag_.get_id());
     }
 
     lcos::future<void> take_reference_async(
@@ -121,18 +125,18 @@ struct managed_object
     explicit managed_object(
         naming::gid_type const& locality
         )
-    {
-        gid_ = stub_type::create_async(
+      : base_type(stub_type::create_async(
             naming::id_type(locality, naming::id_type::unmanaged),
-            naming::invalid_id);
+            naming::invalid_id))
+    {
     }
 
     /// Create a new component on the target locality.
     explicit managed_object(
         naming::id_type const& locality
         )
+      : base_type(stub_type::create_async(locality, naming::invalid_id))
     {
-        gid_ = stub_type::create_async(locality, naming::invalid_id);
     }
 };
 

diff --git a/tests/unit/agas/components/simple_refcnt_checker.hpp b/tests/unit/agas/components/simple_refcnt_checker.hpp
@@ -43,19 +43,23 @@ struct simple_refcnt_monitor
     explicit simple_refcnt_monitor(
         naming::gid_type const& locality
         )
-      : locality_(naming::get_locality_from_gid(locality)
+      : base_type(), flag_(),
+        locality_(naming::get_locality_from_gid(locality)
                 , naming::id_type::unmanaged)
     {
-        gid_ = stub_type::create_async(locality_, flag_.get_id());
+        static_cast<base_type&>(*this) =
+            stub_type::create_async(locality_, flag_.get_id());
     }
 
     /// Create a new component on the target locality.
     explicit simple_refcnt_monitor(
         naming::id_type const& locality
         )
-      : locality_(naming::get_locality_from_id(locality))
+      : base_type(), flag_(),
+        locality_(naming::get_locality_from_id(locality))
     {
-        gid_ = stub_type::create_async(locality_, flag_.get_id());
+        static_cast<base_type&>(*this) =
+            stub_type::create_async(locality_, flag_.get_id());
     }
 
     lcos::future<void> take_reference_async(
@@ -121,18 +125,18 @@ struct simple_object
     explicit simple_object(
         naming::gid_type const& locality
         )
-    {
-        gid_ = stub_type::create_async(
+      : base_type(stub_type::create_async(
             naming::id_type(locality, naming::id_type::unmanaged),
-            naming::invalid_id);
+            naming::invalid_id))
+    {
     }
 
     /// Create a new component on the target locality.
     explicit simple_object(
         naming::id_type const& locality
         )
+      : base_type(stub_type::create_async(locality, naming::invalid_id))
     {
-        gid_ = stub_type::create_async(locality, naming::invalid_id);
     }
 };