From d2d0995097bc0c748c3ee6f8a92f66919c5697a3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 2 Jun 2025 13:12:52 +0200 Subject: Core/Misc: Move fmt::formatter forward declaration to a common header to reduce number of replacements needed when upgrading fmt to new major version --- src/server/game/Entities/Object/ObjectGuid.h | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h index d0c0fafe444..7126b3c8762 100644 --- a/src/server/game/Entities/Object/ObjectGuid.h +++ b/src/server/game/Entities/Object/ObjectGuid.h @@ -20,13 +20,13 @@ #include "Define.h" #include "EnumFlag.h" +#include "StringFormatFwd.h" #include "advstd.h" #include #include #include #include #include -#include #include #include #include @@ -406,34 +406,12 @@ struct std::hash } }; -namespace fmt -{ -inline namespace v10 -{ -template -struct formatter; - template <> -struct formatter +struct fmt::formatter : Trinity::NoArgFormatterBase { - template - constexpr auto parse(ParseContext& ctx) -> decltype(ctx.begin()) - { - auto begin = ctx.begin(), end = ctx.end(); - if (begin == end) - return begin; - - if (*begin != '}') - throw std::invalid_argument("invalid type specifier"); - - return begin; - } - template auto format(ObjectGuid const& guid, FormatContext& ctx) const -> decltype(ctx.out()); }; -} -} namespace Trinity { -- cgit v1.2.3