The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-26 07:45:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

fmt: use make_format_args instead of make_args_checked

Browse Source 
make_args_checked is deprecated
see https://github.com/fmtlib/fmt/pull/2760 and the linked comment
This commit is contained in:
Shawn Hoffman 2022-05-10 16:39:12 -07:00
parent 56626f73bf
commit fa17153ebc
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,8 +94,7 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, 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?");
GenericLogFmtImpl(level, type, file, line, format, GenericLogFmtImpl(level, type, file, line, format, fmt::make_format_args(args...));
fmt::make_args_checked<Args...>(format, args...));
} }
void GenericLog(LogLevel level, LogType type, const char* file, int line, const char* fmt, ...) void GenericLog(LogLevel level, LogType type, const char* file, int line, const char* fmt, ...)

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

@ -43,7 +43,7 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons
"too many arguments?"); "too many arguments?");
static_assert(fmt::is_compile_string<S>::value); static_assert(fmt::is_compile_string<S>::value);
return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format,
fmt::make_args_checked<Args...>(format, args...)); fmt::make_format_args(args...));
} }
template <std::size_t NumFields, bool has_non_positional_args, typename S, typename... Args> template <std::size_t NumFields, bool has_non_positional_args, typename S, typename... Args>
@ -57,12 +57,7 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con
"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?");
static_assert(fmt::is_compile_string<S>::value); static_assert(fmt::is_compile_string<S>::value);
// It's only possible for us to compile-time check the English-language string. auto arg_list = fmt::make_format_args(args...);
// make_args_checked uses static_asserts to verify that a string is formattable with the given
// arguments. But it can't do that if the string varies at runtime, so we can't check
// translations. Still, verifying that the English string is correct will help ensure that
// translations use valid strings.
auto arg_list = fmt::make_args_checked<Args...>(format, 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);
} }