Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure that if the stacktrace fallback is required it always has formatting support #359

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Ensure that if the stacktrace fallback is required it always has formatting support #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b21b59
Ensure that if the stacktrace fallback is required it always has form…
Twon Mar 3, 2025
1677e89
Merge branch 'main' into stacktrace_fallback_has_format_support
Twon Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libraries/core/src/morpheus/core/conformance/stacktrace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#pragma once

#include <morpheus/core/conformance/version.hpp>

#if __has_include(<stacktrace>)
#include <stacktrace>
#endif
Expand All @@ -11,7 +13,6 @@

#define MORPHEUS_CURRENT_STACKTRACE ::morpheus::st_ns::stacktrace::current()
#else

#include <boost/stacktrace/stacktrace.hpp>
namespace morpheus { namespace st_ns = boost::stacktrace; }

Expand Down
2 changes: 1 addition & 1 deletion libraries/core/src/morpheus/core/conversion/adapters/std/stacktrace.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <string_view>

// clang-format off
#if (__cpp_lib_formatters < 202302L)
#if (__cpp_lib_stacktrace < 202011L) or (__cpp_lib_formatters < 202302L)

template <typename Allocator>
struct morpheus::fmt_ns::formatter<morpheus::st_ns::basic_stacktrace<Allocator>>
Expand Down