Fixed #958: Undefined reference to intrusive_ptr_release (Intel only)

STEllAR-GROUP · Oct 17, 2013 · a0236c0 · a0236c0
1 parent 42bec64
commit a0236c0
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 2 deletions.
diff --git a/hpx/runtime/naming/name.hpp b/hpx/runtime/naming/name.hpp
@@ -507,6 +507,15 @@ namespace hpx { namespace naming
         HPX_EXPORT void gid_managed_deleter (id_type_impl* p);
         HPX_EXPORT void gid_unmanaged_deleter (id_type_impl* p);
 
+#if defined(BOOST_INTEL)
+# define HPX_EXPORT_ID_IMPL_HELPERS HPX_EXPORT
+#else
+# define HPX_EXPORT_ID_IMPL_HELPERS /**/
+#endif
+
+        HPX_EXPORT_ID_IMPL_HELPERS void intrusive_ptr_add_ref(id_type_impl* p);
+        HPX_EXPORT_ID_IMPL_HELPERS void intrusive_ptr_release(id_type_impl* p);
+
         ///////////////////////////////////////////////////////////////////////
         struct HPX_EXPORT id_type_impl : gid_type
         {
@@ -553,13 +562,14 @@ namespace hpx { namespace naming
             naming::gid_type prepare_gid() const;
 
             // reference counting
-            friend void intrusive_ptr_add_ref(id_type_impl* p);
-            friend void intrusive_ptr_release(id_type_impl* p);
+            friend HPX_EXPORT_ID_IMPL_HELPERS void intrusive_ptr_add_ref(id_type_impl* p);
+            friend HPX_EXPORT_ID_IMPL_HELPERS void intrusive_ptr_release(id_type_impl* p);
 
             boost::detail::atomic_count count_;
             id_type_management type_;
         };
 
+#if !defined(BOOST_INTEL)
         /// support functions for boost::intrusive_ptr
         inline void intrusive_ptr_add_ref(id_type_impl* p)
         {
@@ -571,6 +581,7 @@ namespace hpx { namespace naming
             if (0 == --p->count_)
                 id_type_impl::get_deleter(p->get_management_type())(p);
         }
+#endif
     }
 
     ///////////////////////////////////////////////////////////////////////////

diff --git a/src/runtime/naming/name.cpp b/src/runtime/naming/name.cpp
@@ -263,6 +263,20 @@ namespace hpx { namespace naming
 
         template HPX_EXPORT void id_type_impl::load(
             util::portable_binary_iarchive&);
+
+#if defined(BOOST_INTEL)
+        /// support functions for boost::intrusive_ptr
+        void intrusive_ptr_add_ref(id_type_impl* p)
+        {
+            ++p->count_;
+        }
+
+        void intrusive_ptr_release(id_type_impl* p)
+        {
+            if (0 == --p->count_)
+                id_type_impl::get_deleter(p->get_management_type())(p);
+        }
+#endif
     }   // detail
 
     ///////////////////////////////////////////////////////////////////////////