Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-07-02 16:43:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fmt: Allow building with version >=12.2.0

Browse Source 
This change was causing some issues:

> Made FMT_STRING a no-op when FMT_USE_CONSTEVAL is enabled, since the consteval format-string constructor already provides compile-time validation (#4611, #4612). Thanks @friedkeenan.
This commit is contained in:
Joshua Vandaële 2026-06-23 05:11:01 +02:00
parent 32ee8ad7ca
commit e97b1cd759
No known key found for this signature in database
GPG Key ID: 6BB95AF71EB0F406
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Logging/Log.h
View File

@ -103,8 +103,9 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con
static_assert(NumFields == sizeof...(args),
"Unexpected number of replacement fields in format string; did you pass too few or "
"too many arguments?");
#if FMT_VERSION >= 110000
#if FMT_VERSION >= 110000 && FMT_VERSION < 120200
// fmt 11 made fmt::string_view no longer directly constructible from compile-time strings.
// In fmt 12.2+, compile-time strings are plain string literals, so this is no longer needed.
auto&& format_str = fmt::format_string<Args...>(format);
#else
auto&& format_str = format;

16
Source/Core/Common/MsgHandler.h
View File

@ -39,7 +39,10 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
static_assert(NumFields == sizeof...(args),
"Unexpected number of replacement fields in format string; did you pass too few or "
"too many arguments?");
#if FMT_VERSION >= 110000
#if FMT_VERSION >= 120200
auto&& format_str = format;
#elif FMT_VERSION >= 110000
static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
auto&& format_str = fmt::format_string<Args...>(format);
#elif FMT_VERSION >= 90000
@ -63,13 +66,14 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con
static_assert(NumFields == sizeof...(args),
"Unexpected number of replacement fields in format string; did you pass too few or "
"too many arguments?");
#if FMT_VERSION >= 110000
static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
#elif FMT_VERSION >= 90000
static_assert(fmt::detail::is_compile_string<S>::value);
#else
#if FMT_VERSION < 90000
static_assert(fmt::is_compile_string<S>::value);
#elif FMT_VERSION < 110000
static_assert(fmt::detail::is_compile_string<S>::value);
#elif FMT_VERSION < 120200
static_assert(std::is_base_of_v<fmt::detail::compile_string, S>);
#endif
// FMT 12.2+ guarantees this will be a compile-time string
auto arg_list = fmt::make_format_args(args...);
return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list);
}