From e549e11aa8e69cf49c73ec56bd4c807bc18e902a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 11 Oct 2025 13:02:11 +0200 Subject: Dep/fmt: Update to 12.0.0 --- src/common/DataStores/DB2FileLoader.cpp | 1 + src/common/Utilities/StringFormat.cpp | 24 +++++++++++----------- src/common/Utilities/StringFormatFwd.h | 2 +- src/server/game/Chat/Chat.h | 4 ++-- .../game/Chat/ChatCommands/ChatCommandHelpers.h | 2 +- .../game/Chat/ChatCommands/ChatCommandTags.h | 10 --------- 6 files changed, 17 insertions(+), 26 deletions(-) (limited to 'src') diff --git a/src/common/DataStores/DB2FileLoader.cpp b/src/common/DataStores/DB2FileLoader.cpp index d3dfa65bf90..5cfc227b656 100644 --- a/src/common/DataStores/DB2FileLoader.cpp +++ b/src/common/DataStores/DB2FileLoader.cpp @@ -22,6 +22,7 @@ #include "StringFormat.h" #include #include +#include #include #include #include diff --git a/src/common/Utilities/StringFormat.cpp b/src/common/Utilities/StringFormat.cpp index acc1b4682e9..be8caf30fd9 100644 --- a/src/common/Utilities/StringFormat.cpp +++ b/src/common/Utilities/StringFormat.cpp @@ -55,15 +55,15 @@ template struct TC_COMMON_API fmt::formatter; template struct TC_COMMON_API fmt::formatter; template struct TC_COMMON_API fmt::formatter>; -template TC_COMMON_API fmt::appender fmt::formatter::format(int const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(unsigned const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(long long const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(unsigned long long const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(bool const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(char const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(float const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(double const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(long double const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(char const* const&, format_context&) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(void const* const&, format_context &) const; -template TC_COMMON_API fmt::appender fmt::formatter::format(string_view const&, format_context &) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(int const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(unsigned const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(long long const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(unsigned long long const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(bool const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(char const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(float const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(double const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(long double const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(char const* const&, format_context&) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(void const* const&, format_context &) const; +template TC_COMMON_API fmt::appender fmt::detail::native_formatter::format(string_view const&, format_context &) const; diff --git a/src/common/Utilities/StringFormatFwd.h b/src/common/Utilities/StringFormatFwd.h index 37990636f41..300b0112b6d 100644 --- a/src/common/Utilities/StringFormatFwd.h +++ b/src/common/Utilities/StringFormatFwd.h @@ -22,7 +22,7 @@ namespace fmt { -inline namespace v10 +inline namespace v12 { template struct formatter; diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h index 28da9630678..9ed2222208c 100644 --- a/src/server/game/Chat/Chat.h +++ b/src/server/game/Chat/Chat.h @@ -60,7 +60,7 @@ class TC_GAME_API ChatHandler template void PSendSysMessage(char const* fmt, Args&&... args) { - SendSysMessage(StringVPrintf(fmt, fmt::make_printf_args(std::forward(args)...))); + SendSysMessage(StringVPrintf(fmt, fmt::make_printf_args(args...))); } template @@ -72,7 +72,7 @@ class TC_GAME_API ChatHandler template static std::string PGetParseString(std::string_view fmt, Args&&... args) { - return StringVPrintf(fmt, fmt::make_printf_args(std::forward(args)...)); + return StringVPrintf(fmt, fmt::make_printf_args(args...)); } template diff --git a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h index 27bd1285fe9..271e1d70a45 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h @@ -127,7 +127,7 @@ namespace Trinity::Impl::ChatCommands template std::string FormatTrinityString(ChatHandler const* handler, TrinityStrings which, Ts&&... args) { - return FormatTrinityString(GetTrinityString(handler, which), fmt::make_printf_args(std::forward(args)...)); + return FormatTrinityString(GetTrinityString(handler, which), fmt::make_printf_args(args...)); } } diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index 3e31108adec..f01e7fc9518 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -298,14 +298,4 @@ namespace Trinity::ChatCommands template struct fmt::formatter> : ostream_formatter {}; -template -struct fmt::printf_formatter> : formatter -{ - template - auto format(T const& value, basic_format_context& ctx) const -> OutputIt - { - return formatter::format(*value, ctx); - } -}; - #endif -- cgit v1.2.3