From ec87d048b4ebbb326158bc05512d1cc5ecbe8271 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 27 Apr 2020 09:06:49 +0200 Subject: Core/Misc: Enum flag v3 - allow enabling flag operations directly after enum definition when inside namespaces --- src/server/game/AuctionHouse/AuctionHouseMgr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/AuctionHouse/AuctionHouseMgr.h') diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 86e311a67af..308df2083a4 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -111,7 +111,7 @@ enum class AuctionHouseFilterMask : uint32 ArtifactQuality = 0x400, }; -namespace EnumFlag { template<> struct IsFlag : std::true_type { }; } +DEFINE_ENUM_FLAG(AuctionHouseFilterMask); enum class AuctionHouseSortOrder : uint8 { @@ -295,7 +295,7 @@ public: void Update(); void BuildListBuckets(WorldPackets::AuctionHouse::AuctionListBucketsResult& listBucketsResult, Player* player, - std::wstring const& name, uint8 minLevel, uint8 maxLevel, EnumFlag_t filters, Optional const& classFilters, + std::wstring const& name, uint8 minLevel, uint8 maxLevel, EnumFlag filters, Optional const& classFilters, uint8 const* knownPetBits, std::size_t knownPetBitsCount, uint8 maxKnownPetLevel, uint32 offset, WorldPackets::AuctionHouse::AuctionSortDef const* sorts, std::size_t sortCount); void BuildListBuckets(WorldPackets::AuctionHouse::AuctionListBucketsResult& listBucketsResult, Player* player, -- cgit v1.2.3