ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10825 from Rudolchr/fix_build_with_libfmt-9 

MsgHandler: Add a check for libfmt version to fix build with libfmt-9
This commit is contained in:
Admiral H. Curtiss 2022-07-11 23:02:08 +02:00 committed by GitHub
parent 20059776d9 66f330e573
commit 32523f155b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,11 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
static_assert(NumFields == sizeof...(args), static_assert(NumFields == sizeof...(args),
"Unexpected number of replacement fields in format string; did you pass too few or " "Unexpected number of replacement fields in format string; did you pass too few or "
"too many arguments?"); "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); static_assert(fmt::is_compile_string<S>::value);
#endif
return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
fmt::make_format_args(args...)); 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), static_assert(NumFields == sizeof...(args),
"Unexpected number of replacement fields in format string; did you pass too few or " "Unexpected number of replacement fields in format string; did you pass too few or "
"too many arguments?"); "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); static_assert(fmt::is_compile_string<S>::value);
#endif
auto arg_list = fmt::make_format_args(args...); auto arg_list = fmt::make_format_args(args...);
return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list);
} }