Merge pull request #2004 from chinz07/fixing_2000

Fixing 2000
STEllAR-GROUP · Feb 26, 2016 · 63aec76 · 63aec76
2 parents c9093d9 + f0553bc
commit 63aec76
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/hpx/exception.hpp b/hpx/exception.hpp
@@ -1554,18 +1554,14 @@ namespace hpx
     }
 
         // forwarder for HPX_ASSERT handler
-    inline void assertion_failed(char const* expr, char const* function,
-        char const* file, long line)
-    {
-        hpx::detail::assertion_failed(expr, function, file, line);
-    }
+    HPX_ATTRIBUTE_NORETURN HPX_EXPORT
+    void assertion_failed(char const* expr, char const* function,
+        char const* file, long line);
 
     // forwarder for HPX_ASSERT_MSG handler
-    inline void assertion_failed_msg(char const* msg, char const* expr,
-        char const* function, char const* file, long line)
-    {
-        hpx::detail::assertion_failed_msg(msg, expr, function, file, line);
-    }
+    HPX_ATTRIBUTE_NORETURN HPX_EXPORT
+    void assertion_failed_msg(char const* msg, char const* expr,
+        char const* function, char const* file, long line);
 
     // For testing purposes we sometime expect to see exceptions, allow those
     // to go through without attaching a debugger.

diff --git a/src/exception.cpp b/src/exception.cpp
@@ -1137,6 +1137,18 @@ namespace hpx
     {
         return get_error_state(detail::access_exception(e));
     }
+
+    void assertion_failed(char const* expr, char const* function,
+        char const* file, long line)
+    {
+        hpx::detail::assertion_failed(expr, function, file, line);
+    }
+
+    void assertion_failed_msg(char const* msg, char const* expr,
+        char const* function, char const* file, long line)
+    {
+        hpx::detail::assertion_failed_msg(msg, expr, function, file, line);
+    }
 }