From 56caea6ec8d1c1a4566b9fa1ffaf977766371b7a Mon Sep 17 00:00:00 2001 From: JordanTheToaster Date: Wed, 19 Aug 2026 11:07:04 +0100 Subject: [PATCH] Misc: Fix deprecation warnings --- common/Console.h | 4 ++-- common/Error.h | 2 +- common/SmallString.h | 8 ++++---- pcsx2/Achievements.cpp | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/common/Console.h b/common/Console.h index 8391b32983..8baf736c9a 100644 --- a/common/Console.h +++ b/common/Console.h @@ -106,7 +106,7 @@ namespace Log { // Avoid arg packing if filtered. if (level <= GetMaxLevel()) - return WriteFmtArgs(level, color, fmt, fmt::make_format_args(args...)); + return WriteFmtArgs(level, color, fmt.get(), fmt::make_format_args(args...)); } } // namespace Log @@ -143,7 +143,7 @@ struct ConsoleLogWriter #define MAKE_FMT_CONSOLE_WRITER(color) do \ { \ if (level <= Log::GetMaxLevel()) \ - Log::WriteFmtArgs(level, color, fmt, fmt::make_format_args(args...)); \ + Log::WriteFmtArgs(level, color, fmt.get(), fmt::make_format_args(args...)); \ } \ while (0) diff --git a/common/Error.h b/common/Error.h index 06442bfc9d..384878d2dc 100644 --- a/common/Error.h +++ b/common/Error.h @@ -86,7 +86,7 @@ public: static void SetStringFmt(Error* errptr, fmt::format_string fmt, T&&... args) { if (errptr) - Error::SetString(errptr, fmt::vformat(fmt, fmt::make_format_args(args...))); + Error::SetString(errptr, fmt::vformat(fmt.get(), fmt::make_format_args(args...))); } void AddPrefix(std::string_view prefix); diff --git a/common/SmallString.h b/common/SmallString.h index 1b4d74dbe2..60089c3507 100644 --- a/common/SmallString.h +++ b/common/SmallString.h @@ -362,7 +362,7 @@ template __fi SmallStackString SmallStackString::from_format(fmt::format_string fmt, T&&... args) { SmallStackString ret; - fmt::vformat_to(std::back_inserter(ret), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(ret), fmt.get(), fmt::make_format_args(args...)); return ret; } @@ -381,14 +381,14 @@ using SmallString = SmallStackString<256>; template __fi void SmallStringBase::append_format(fmt::format_string fmt, T&&... args) { - fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(*this), fmt.get(), fmt::make_format_args(args...)); } template __fi void SmallStringBase::prepend_format(fmt::format_string fmt, T&&... args) { TinyString str; - fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...)); prepend(str); } @@ -396,7 +396,7 @@ template __fi void SmallStringBase::format(fmt::format_string fmt, T&&... args) { clear(); - fmt::vformat_to(std::back_inserter(*this), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(*this), fmt.get(), fmt::make_format_args(args...)); } #ifdef _MSC_VER diff --git a/pcsx2/Achievements.cpp b/pcsx2/Achievements.cpp index 58ffb61f5c..40562c7201 100644 --- a/pcsx2/Achievements.cpp +++ b/pcsx2/Achievements.cpp @@ -275,7 +275,7 @@ template void Achievements::ReportFmtError(fmt::format_string fmt, T&&... args) { SmallString str; - fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...)); ReportError(str); } @@ -283,7 +283,7 @@ template void Achievements::ReportRCError(int err, fmt::format_string fmt, T&&... args) { SmallString str; - fmt::vformat_to(std::back_inserter(str), fmt, fmt::make_format_args(args...)); + fmt::vformat_to(std::back_inserter(str), fmt.get(), fmt::make_format_args(args...)); str.append_format("{} ({})", rc_error_str(err), err); ReportError(str); }