fix attempt

Update stacktrace.hpp
2026-01-28 19:52:08 +00:00 · 2024-09-13 19:13:33 +03:00 · 2024-09-13 11:25:41 +03:00 · 2024-09-13 07:20:27 +03:00 · 2024-09-13 00:29:53 +03:00 · 2024-09-12 22:34:47 +03:00
2 changed files with 10 additions and 4 deletions
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -180,4 +180,5 @@ lib boost_stacktrace_from_exception
  : # usage-requirements
    #<link>shared:<define>BOOST_STACKTRACE_DYN_LINK=1
    <define>BOOST_STACKTRACE_NO_LIB=1
+    <define>BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION=1
  ;
--- a/include/boost/stacktrace/stacktrace.hpp
+++ b/include/boost/stacktrace/stacktrace.hpp
@@ -37,15 +37,18 @@

 extern "C" {

-//#if defined(BOOST_STACKTRACE_LINK) && defined(BOOST_STACKTRACE_DYN_LINK)
-BOOST_SYMBOL_EXPORT
-//#endif
-inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
 const char* boost_stacktrace_impl_current_exception_stacktrace();
 bool* boost_stacktrace_impl_ref_capture_stacktraces_at_throw();

 }

+#ifndef BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION
+
+extern "C" {
+BOOST_SYMBOL_EXPORT
+inline void* boost_stacktrace_impl_return_nullptr() { return nullptr; }
+}
+
 #ifdef _M_IX86
 #   pragma comment(linker, "/ALTERNATENAME:_boost_stacktrace_impl_current_exception_stacktrace=_boost_stacktrace_impl_return_nullptr")
 #   pragma comment(linker, "/ALTERNATENAME:_boost_stacktrace_impl_ref_capture_stacktraces_at_throw=_boost_stacktrace_impl_return_nullptr")
@@ -54,6 +57,8 @@ bool* boost_stacktrace_impl_ref_capture_stacktraces_at_throw();
 #   pragma comment(linker, "/ALTERNATENAME:boost_stacktrace_impl_ref_capture_stacktraces_at_throw=boost_stacktrace_impl_return_nullptr")
 #endif

+#endif  // #ifndef BOOST_STACKTRACE_LINKED_WITH_FROM_EXCEPTION
+
 #endif

 namespace boost { namespace stacktrace {
Author	SHA1	Message	Date
Antony Polukhin	762b4916fc	fix attempt	2024-09-13 19:13:33 +03:00
Antony Polukhin	3c756ad478	Update stacktrace.hpp	2024-09-13 11:25:41 +03:00
Antony Polukhin	005bcbad7d	Update stacktrace.hpp	2024-09-13 07:20:27 +03:00
Antony Polukhin	b105972fbc	Update stacktrace.hpp	2024-09-13 00:29:53 +03:00
Antony Polukhin	c624479813	Another fix attempt for #177	2024-09-12 22:34:47 +03:00