diff options
| author | Joshua Vandaƫle <joshua@vandaele.software> | 2026-06-23 05:11:01 +0200 |
|---|---|---|
| committer | Joshua Vandaƫle <joshua@vandaele.software> | 2026-06-23 21:09:14 +0200 |
| commit | e97b1cd759deeb6c2e0b7a6de33d5986ee033b6e (patch) | |
| tree | 80ca86f4b5531f89486823700d274182aa1bcab0 /Source/Core/Common/Logging | |
| parent | 32ee8ad7ca618669f595f845aff4d59e1eb20511 (diff) | |
fmt: Allow building with version >=12.2.0
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.
Diffstat (limited to 'Source/Core/Common/Logging')
| -rw-r--r-- | Source/Core/Common/Logging/Log.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index 64d353af00..62119c8648 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -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; |
