Working around gcc 4.4 deficits related to #1115: Compile error with …

…Intel C++ 13.1
STEllAR-GROUP · Apr 22, 2014 · 37e4e13 · 37e4e13
1 parent f4865db
commit 37e4e13
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/hpx/util/coroutine/detail/tss.hpp b/hpx/util/coroutine/detail/tss.hpp
@@ -39,6 +39,10 @@ namespace hpx { namespace util { namespace coroutines
             HPX_MOVABLE_BUT_NOT_COPYABLE(tss_data_node)
 
         public:
+            tss_data_node()
+              : value_(0)
+            {}
+
             tss_data_node(void* val)
               : func_(),
                 value_(val)

diff --git a/src/util/coroutine/detail/tss.cpp b/src/util/coroutine/detail/tss.cpp
@@ -79,13 +79,15 @@ namespace hpx { namespace util { namespace coroutines { namespace detail
         void insert(void const* key,
             boost::shared_ptr<tss_cleanup_function> const& func, void* tss_data)
         {
-            data_.insert(std::make_pair(key, tss_data_node(func, tss_data)));
+            tss_data_node node(func, tss_data);
+            data_[key] = std::move(node);
         }
 
         void insert(void const* key, void* tss_data)
         {
             boost::shared_ptr<tss_cleanup_function> func;
-            data_.insert(std::make_pair(key, tss_data_node(func, tss_data)));
+            tss_data_node node(func, tss_data);
+            data_[key] = std::move(node);
         }
 
         void erase(void const* key, bool cleanup_existing)