From bdc8410f8211c3084108969900b82dafd6dbef84 Mon Sep 17 00:00:00 2001 From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com> Date: Sun, 2 Jul 2023 10:33:52 -0400 Subject: [PATCH] Add dbghelp config to workflow --- .github/workflows/build.yml | 16 ++++++++-------- .gitignore | 1 + src/symbols/symbols_with_dbghelp.cpp | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9af9163..6d989c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,13 +14,13 @@ jobs: target: [Debug] std: [11, 20] unwind: [ - LIBCPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE, - LIBCPPTRACE_GET_SYMBOLS_WITH_NOTHING, - ] - symbols: [ LIBCPPTRACE_UNWIND_WITH_EXECINFO, LIBCPPTRACE_UNWIND_WITH_NOTHING, ] + symbols: [ + LIBCPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE, + LIBCPPTRACE_GET_SYMBOLS_WITH_NOTHING, + ] demangle: [ LIBCPPTRACE_DEMANGLE_WITH_CXXABI, LIBCPPTRACE_DEMANGLE_WITH_NOTHING, @@ -51,13 +51,13 @@ jobs: target: [Debug] std: [11, 20] unwind: [ - # LIBCPPTRACE_GET_SYMBOLS_WITH_LIBBACKTRACE - LIBCPPTRACE_GET_SYMBOLS_WITH_NOTHING, - ] - symbols: [ LIBCPPTRACE_UNWIND_WITH_WINAPI, LIBCPPTRACE_UNWIND_WITH_NOTHING, ] + symbols: [ + LIBCPPTRACE_GET_SYMBOLS_WITH_DBGHELP, + LIBCPPTRACE_GET_SYMBOLS_WITH_NOTHING, + ] demangle: [ # LIBCPPTRACE_DEMANGLE_WITH_CXXABI, LIBCPPTRACE_DEMANGLE_WITH_NOTHING, diff --git a/.gitignore b/.gitignore index ecd87b2..71a5bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode build +build2 a.out test/build diff --git a/src/symbols/symbols_with_dbghelp.cpp b/src/symbols/symbols_with_dbghelp.cpp index 3942a30..7fec22e 100644 --- a/src/symbols/symbols_with_dbghelp.cpp +++ b/src/symbols/symbols_with_dbghelp.cpp @@ -80,7 +80,7 @@ namespace cpptrace { ); } // special case to properly free a buffer and convert string to narrow chars, only used for TI_GET_SYMNAME - static_assert(SymType == IMAGEHLP_SYMBOL_TYPE_INFO::TI_GET_SYMNAME); + static_assert(SymType == IMAGEHLP_SYMBOL_TYPE_INFO::TI_GET_SYMNAME, "get_info_wchar called with unexpected IMAGEHLP_SYMBOL_TYPE_INFO"); std::wstring wstr(info); std::string str; str.reserve(wstr.size());