Merge pull request #3004 from STEllAR-GROUP/future_data_void-warn

Silence C4251 (needs to have dll-interface) for future_data_void
STEllAR-GROUP · Nov 17, 2017 · 42a588b · 42a588b
2 parents 660def2 + 331ad7b
commit 42a588b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/hpx/lcos/detail/future_data.hpp b/hpx/lcos/detail/future_data.hpp
@@ -38,6 +38,8 @@
 #include <type_traits>
 #include <utility>
 
+#include <hpx/config/warnings_prefix.hpp>
+
 ///////////////////////////////////////////////////////////////////////////////
 namespace hpx { namespace lcos
 {
@@ -62,15 +64,15 @@ namespace detail
     void intrusive_ptr_release(future_data_refcnt_base* p);
 
     ///////////////////////////////////////////////////////////////////////
-    struct future_data_refcnt_base
+    struct HPX_EXPORT future_data_refcnt_base
     {
     private:
         typedef util::unique_function_nonser<void()> completed_callback_type;
 
     public:
         typedef void has_future_data_refcnt_base;
 
-        virtual ~future_data_refcnt_base() {}
+        virtual ~future_data_refcnt_base();
 
         virtual void set_on_completed(completed_callback_type) = 0;
 
@@ -1050,4 +1052,6 @@ namespace hpx { namespace traits
 #endif
 }}
 
+#include <hpx/config/warnings_suffix.hpp>
+
 #endif
diff --git a/src/lcos/detail/future_data.cpp b/src/lcos/detail/future_data.cpp
@@ -26,6 +26,9 @@
 
 namespace hpx { namespace lcos { namespace detail
 {
+    future_data_refcnt_base::~future_data_refcnt_base() = default;
+
+    ///////////////////////////////////////////////////////////////////////////
     static bool run_on_completed_on_new_thread(
         util::unique_function_nonser<bool()> && f, error_code& ec)
     {