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

Jump to bottom

fix build for master fmt (non-bundled) #2694

Merged
merged 3 commits into from
Mar 31, 2023
Merged

fix build for master fmt (non-bundled) #2694

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a77f3c9
fix build for master fmt (non-bundled)
H1X4Dev Mar 31, 2023
651fc42
update fmt_runtime_string macro
H1X4Dev Mar 31, 2023
607a521
fix build of updated macro
H1X4Dev Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion include/spdlog/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,18 @@ using format_string_t = fmt::format_string<Args...>;
template<class T>
using remove_cvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;

#if FMT_VERSION >= 90101
# define FMT_STRING_RUNTIME fmt::runtime_format_string<Char>
#else
# define FMT_STRING_RUNTIME fmt::basic_runtime<Char>
#endif
H1X4Dev marked this conversation as resolved.
Show resolved Hide resolved

// clang doesn't like SFINAE disabled constructor in std::is_convertible<> so have to repeat the condition from basic_format_string here,
// in addition, fmt::basic_runtime<Char> is only convertible to basic_format_string<Char> but not basic_string_view<Char>
template<class T, class Char = char>
struct is_convertible_to_basic_format_string
: std::integral_constant<bool,
std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, fmt::basic_runtime<Char>>::value>
std::is_convertible<T, fmt::basic_string_view<Char>>::value || std::is_same<remove_cvref_t<T>, FMT_STRING_RUNTIME>::value>
H1X4Dev marked this conversation as resolved.
Show resolved Hide resolved
{};

# if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
Expand Down