diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-07-11 23:02:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-11 23:02:08 +0200 |
| commit | 32523f155b39a77c5c388708afd9fc9701dd83ff (patch) | |
| tree | 7b47616abbd5913dc739dc30ce5e51d1973cbcee /Source/Core | |
| parent | 20059776d91da7d9ea9914a45d3772cb284534af (diff) | |
| parent | 66f330e57316257fe81b46f57dad22ea6dee7bae (diff) | |
Merge pull request #10825 from Rudolchr/fix_build_with_libfmt-9
MsgHandler: Add a check for libfmt version to fix build with libfmt-9
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/MsgHandler.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index 750da515b0..1d6a467852 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -41,7 +41,11 @@ 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 >= 90000 + static_assert(fmt::detail::is_compile_string<S>::value); +#else static_assert(fmt::is_compile_string<S>::value); +#endif return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, fmt::make_format_args(args...)); } @@ -56,7 +60,11 @@ 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 >= 90000 + static_assert(fmt::detail::is_compile_string<S>::value); +#else static_assert(fmt::is_compile_string<S>::value); +#endif auto arg_list = fmt::make_format_args(args...); return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); } |