luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Jeremy Rifkin 2025-01-04 22:57:40 -06:00
commit f35ef65ed6
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Autoconfig.cmake
View File

@ -4,6 +4,8 @@ function(check_support var source includes libraries definitions)
list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
set(CMAKE_REQUIRED_LIBRARIES "${libraries}") set(CMAKE_REQUIRED_LIBRARIES "${libraries}")
set(CMAKE_REQUIRED_DEFINITIONS "${definitions}") set(CMAKE_REQUIRED_DEFINITIONS "${definitions}")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
string(CONCAT full_source "#include \"${source}\"" ${nonce}) string(CONCAT full_source "#include \"${source}\"" ${nonce})
check_cxx_source_compiles(${full_source} ${var}) check_cxx_source_compiles(${full_source} ${var})
set(${var} ${${var}} PARENT_SCOPE) set(${var} ${${var}} PARENT_SCOPE)

2
src/utils.cpp
View File

@ -40,7 +40,7 @@ namespace cpptrace {
} }
} }
[[noreturn]] void terminate_handler() { [[noreturn]] void MSVC_CDECL terminate_handler() {
// TODO: Support std::nested_exception? // TODO: Support std::nested_exception?
try { try {
auto ptr = std::current_exception(); auto ptr = std::current_exception();

6
src/utils/common.hpp
View File

@ -25,6 +25,12 @@
#define NODISCARD #define NODISCARD
#endif #endif
#if IS_MSVC
#define MSVC_CDECL __cdecl
#else
#define MSVC_CDECL
#endif
namespace cpptrace { namespace cpptrace {
namespace detail { namespace detail {
static const stacktrace_frame null_frame { static const stacktrace_frame null_frame {