From 2aedd8ecdb16a8c72ff89c6c09ad99fff23609b1 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 3 May 2024 19:38:57 +0200
Subject: Dep/fmt: Upgrade to 10.2.1

---
 src/common/Utilities/StringFormat.h          | 4 ++++
 src/server/game/DungeonFinding/LFG.h         | 4 ++++
 src/server/game/DungeonFinding/LFGMgr.h      | 5 +++++
 src/server/game/Entities/Object/ObjectGuid.h | 5 +++--
 4 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/common/Utilities/StringFormat.h b/src/common/Utilities/StringFormat.h
index 3ec91494ef2..6f5e9a643bd 100644
--- a/src/common/Utilities/StringFormat.h
+++ b/src/common/Utilities/StringFormat.h
@@ -122,4 +122,8 @@ struct fmt::formatter<Optional<T>, Char> : formatter<T, Char>
     }
 };
 
+// allow implicit enum to int conversions for formatting
+template <typename E, std::enable_if_t<std::is_enum_v<E>, std::nullptr_t> = nullptr>
+auto format_as(E e) { return std::underlying_type_t<E>(e); }
+
 #endif
diff --git a/src/server/game/DungeonFinding/LFG.h b/src/server/game/DungeonFinding/LFG.h
index 4adf425f79b..1387507d00a 100644
--- a/src/server/game/DungeonFinding/LFG.h
+++ b/src/server/game/DungeonFinding/LFG.h
@@ -139,6 +139,10 @@ TC_GAME_API std::string ConcatenateDungeons(LfgDungeonSet const& dungeons);
 TC_GAME_API std::string GetRolesString(uint8 roles);
 TC_GAME_API std::string GetStateString(LfgState state);
 
+// allow implicit enum to int conversions for formatting
+inline int32 format_as(LfgUpdateType e) { return e; }
+inline uint8 format_as(LfgState e) { return e; }
+
 } // namespace lfg
 
 #endif
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
index 99a0a46be84..cadf42d3061 100644
--- a/src/server/game/DungeonFinding/LFGMgr.h
+++ b/src/server/game/DungeonFinding/LFGMgr.h
@@ -502,6 +502,11 @@ class TC_GAME_API LFGMgr
         LfgGroupDataContainer GroupsStore;                 /// Group data
 };
 
+inline int32 format_as(LFGMgrEnum e) { return e; }
+inline int32 format_as(LfgProposalState e) { return e; }
+inline uint8 format_as(LfgTeleportResult e) { return e; }
+inline int32 format_as(LfgJoinResult e) { return e; }
+inline int32 format_as(LfgRoleCheckState e) { return e; }
 } // namespace lfg
 
 #define sLFGMgr lfg::LFGMgr::instance()
diff --git a/src/server/game/Entities/Object/ObjectGuid.h b/src/server/game/Entities/Object/ObjectGuid.h
index 5be69654e21..1431934661f 100644
--- a/src/server/game/Entities/Object/ObjectGuid.h
+++ b/src/server/game/Entities/Object/ObjectGuid.h
@@ -25,6 +25,7 @@
 #include <functional>
 #include <list>
 #include <set>
+#include <stdexcept>
 #include <string>
 #include <type_traits>
 #include <unordered_set>
@@ -429,7 +430,7 @@ namespace std
 
 namespace fmt
 {
-inline namespace v9
+inline namespace v10
 {
 template <typename T, typename Char, typename Enable>
 struct formatter;
@@ -445,7 +446,7 @@ struct formatter<ObjectGuid, char, void>
             return begin;
 
         if (*begin != '}')
-            ctx.on_error("invalid type specifier");
+            throw std::invalid_argument("invalid type specifier");
 
         return begin;
     }
-- 
cgit v1.2.3