Attempt to fix problem in managed_component_base

STEllAR-GROUP · Jun 1, 2017 · fb6da29 · fb6da29
1 parent ac340b2
commit fb6da29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/hpx/runtime/components/server/managed_component_base.hpp b/hpx/runtime/components/server/managed_component_base.hpp
@@ -295,9 +295,10 @@ namespace hpx { namespace components
             static heap_type& get_heap()
             {
                 // ensure thread-safe initialization
-                util::reinitializable_static<
-                    heap_type, wrapper_heap_tag
-                > heap(components::get_component_type<Component>());
+                static components::component_type t =
+                    components::get_component_type<Component>();
+
+                util::reinitializable_static<heap_type, wrapper_heap_tag> heap(t);
                 return heap.get();
             }
 

diff --git a/hpx/runtime/components/server/memory_block.hpp b/hpx/runtime/components/server/memory_block.hpp
@@ -567,9 +567,11 @@ namespace hpx { namespace components { namespace server
         static heap_type& get_heap()
         {
             // ensure thread-safe initialization
+            static component_type t = component_memory_block;
+
             util::reinitializable_static<
                 heap_type, wrapper_heap_tag, HPX_RUNTIME_INSTANCE_LIMIT
-            > heap(component_memory_block);
+            > heap(t);
             return heap.get(get_runtime_instance_number());
         }