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

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Jeremy 2024-05-12 22:00:45 -05:00
commit 323ab5814e
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -123,7 +123,7 @@ if(WIN32)
endif() endif()
``` ```
Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DDCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line
information. information.
On macOS it is recommended to generate a `.dSYM` file, see [Platform Logistics](#platform-logistics) below. On macOS it is recommended to generate a `.dSYM` file, see [Platform Logistics](#platform-logistics) below.
@ -432,7 +432,7 @@ namespace cpptrace {
Cpptrace exceptions can provide great information for user-controlled exceptions. For non-cpptrace::exceptions that may Cpptrace exceptions can provide great information for user-controlled exceptions. For non-cpptrace::exceptions that may
originate outside of code you control, e.g. the standard library, cpptrace provides some wrapper utilities that can originate outside of code you control, e.g. the standard library, cpptrace provides some wrapper utilities that can
rethrow these exceptions nested in traced cpptrace exceptions. The trace won't be perfect, the trace will start where rethrow these exceptions nested in traced cpptrace exceptions. The trace won't be perfect, the trace will start where
the rapper caught it, but these utilities can provide good diagnostic information. Unfortunately this is the best the wrapper caught it, but these utilities can provide good diagnostic information. Unfortunately this is the best
solution for this problem, as far as I know. solution for this problem, as far as I know.
```cpp ```cpp
@ -603,7 +603,7 @@ target_link_libraries(your_target cpptrace::cpptrace)
It's as easy as that. Cpptrace will automatically configure itself for your system. Note: On windows and macos some It's as easy as that. Cpptrace will automatically configure itself for your system. Note: On windows and macos some
extra work is required, see [Platform Logistics](#platform-logistics) below. extra work is required, see [Platform Logistics](#platform-logistics) below.
Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DDCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line
information. information.
## System-Wide Installation ## System-Wide Installation
@ -623,7 +623,7 @@ Using through cmake:
find_package(cpptrace REQUIRED) find_package(cpptrace REQUIRED)
target_link_libraries(<your target> cpptrace::cpptrace) target_link_libraries(<your target> cpptrace::cpptrace)
``` ```
Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DDCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line Be sure to configure with `-DCMAKE_BUILD_TYPE=Debug` or `-DCMAKE_BUILD_TYPE=RelWithDebInfo` for symbols and line
information. information.
Or compile with `-lcpptrace`: Or compile with `-lcpptrace`:
@ -641,7 +641,7 @@ If you get an error along the lines of
error while loading shared libraries: libcpptrace.so: cannot open shared object file: No such file or directory error while loading shared libraries: libcpptrace.so: cannot open shared object file: No such file or directory
``` ```
You may have to run `sudo /sbin/ldconfig` to create any necessary links and update caches so the system can find You may have to run `sudo /sbin/ldconfig` to create any necessary links and update caches so the system can find
libcpptrace.so (I had to do this on Ubuntu). Only when installing system-wide. Usually your package manger does this for libcpptrace.so (I had to do this on Ubuntu). Only when installing system-wide. Usually your package manager does this for
you when installing new libraries. you when installing new libraries.
<details> <details>

4
src/utils/exception_type.hpp
View File

@ -4,7 +4,7 @@
#include <string> #include <string>
// libstdc++ and libc++ // libstdc++ and libc++
#if defined(CPPTRACE_HAS_CXX_EXCEPTION_TYPE) && defined(__GLIBCXX__) || defined(__GLIBCPP__) || defined(_LIBCPP_VERSION) #if defined(CPPTRACE_HAS_CXX_EXCEPTION_TYPE) && (defined(__GLIBCXX__) || defined(__GLIBCPP__) || defined(_LIBCPP_VERSION))
#include <cxxabi.h> #include <cxxabi.h>
#endif #endif
@ -13,7 +13,7 @@
namespace cpptrace { namespace cpptrace {
namespace detail { namespace detail {
inline std::string exception_type_name() { inline std::string exception_type_name() {
#if defined(CPPTRACE_HAS_CXX_EXCEPTION_TYPE) && defined(__GLIBCXX__) || defined(__GLIBCPP__) || defined(_LIBCPP_VERSION) #if defined(CPPTRACE_HAS_CXX_EXCEPTION_TYPE) && (defined(__GLIBCXX__) || defined(__GLIBCPP__) || defined(_LIBCPP_VERSION))
const std::type_info* t = abi::__cxa_current_exception_type(); const std::type_info* t = abi::__cxa_current_exception_type();
return t ? detail::demangle(t->name()) : "<unknown>"; return t ? detail::demangle(t->name()) : "<unknown>";
#else #else