From cbd36d5a4e97d41e56b7339a619ee1072fc9cc17 Mon Sep 17 00:00:00 2001 From: Dehravor Date: Thu, 1 May 2014 10:10:13 +0200 Subject: Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros --- src/server/collision/Management/MMapFactory.h | 3 +- src/server/collision/Management/MMapManager.h | 9 +- src/server/collision/Management/VMapManager2.h | 8 +- src/server/collision/Maps/MapTree.h | 6 +- src/server/collision/Models/GameObjectModel.cpp | 2 +- src/server/game/AI/SmartScripts/SmartScript.h | 2 +- src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 4 +- src/server/game/AI/SmartScripts/SmartScriptMgr.h | 8 +- src/server/game/Achievements/AchievementMgr.h | 12 +-- src/server/game/AuctionHouse/AuctionHouseMgr.h | 2 +- src/server/game/Battlegrounds/ArenaTeamMgr.h | 2 +- src/server/game/Battlegrounds/BattlegroundMgr.h | 2 +- src/server/game/DungeonFinding/LFGMgr.h | 2 +- src/server/game/Entities/Creature/Creature.h | 14 +-- src/server/game/Entities/Creature/CreatureGroups.h | 4 +- src/server/game/Entities/GameObject/GameObject.h | 2 +- .../game/Entities/Item/ItemEnchantmentMgr.cpp | 2 +- src/server/game/Entities/Item/ItemPrototype.h | 2 +- src/server/game/Entities/Object/Object.h | 2 +- src/server/game/Entities/Pet/Pet.h | 2 +- src/server/game/Entities/Player/Player.h | 14 +-- src/server/game/Entities/Unit/Unit.cpp | 2 +- src/server/game/Entities/Unit/Unit.h | 4 +- src/server/game/Events/GameEventMgr.cpp | 2 +- src/server/game/Events/GameEventMgr.h | 2 +- src/server/game/Globals/ObjectAccessor.cpp | 2 +- src/server/game/Globals/ObjectAccessor.h | 8 +- src/server/game/Globals/ObjectMgr.h | 72 ++++++------- src/server/game/Groups/Group.h | 2 +- src/server/game/Guilds/Guild.h | 2 +- src/server/game/Guilds/GuildMgr.h | 2 +- src/server/game/Instances/InstanceSaveMgr.h | 6 +- src/server/game/Loot/LootMgr.h | 2 +- src/server/game/Maps/Map.h | 10 +- src/server/game/Maps/MapInstanced.h | 2 +- src/server/game/Maps/MapManager.h | 2 +- src/server/game/Maps/TransportMgr.h | 6 +- .../game/Movement/Waypoints/WaypointManager.h | 2 +- src/server/game/Scripting/ScriptSystem.h | 2 +- src/server/game/Server/WorldSession.h | 2 +- src/server/game/Skills/SkillDiscovery.cpp | 2 +- src/server/game/Spells/SpellMgr.h | 15 +-- src/server/game/Texts/CreatureTextMgr.h | 8 +- src/server/game/Weather/WeatherMgr.cpp | 4 +- src/server/game/World/World.h | 4 +- .../Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp | 8 +- src/server/shared/Common.h | 2 +- src/server/shared/CompilerDefs.h | 8 -- src/server/shared/Dynamic/HashNamespace.h | 119 --------------------- src/server/shared/Dynamic/ObjectRegistry.h | 2 +- src/server/shared/Dynamic/UnorderedMap.h | 72 ------------- src/server/shared/Dynamic/UnorderedSet.h | 66 ------------ src/server/shared/Logging/Appender.h | 5 +- src/server/shared/Logging/Log.h | 6 +- 54 files changed, 147 insertions(+), 410 deletions(-) delete mode 100644 src/server/shared/Dynamic/HashNamespace.h delete mode 100644 src/server/shared/Dynamic/UnorderedMap.h delete mode 100644 src/server/shared/Dynamic/UnorderedSet.h (limited to 'src') diff --git a/src/server/collision/Management/MMapFactory.h b/src/server/collision/Management/MMapFactory.h index 837c893f038..4b883d43613 100644 --- a/src/server/collision/Management/MMapFactory.h +++ b/src/server/collision/Management/MMapFactory.h @@ -19,11 +19,12 @@ #ifndef _MMAP_FACTORY_H #define _MMAP_FACTORY_H +#include "Define.h" #include "MMapManager.h" -#include "UnorderedMap.h" #include "DetourAlloc.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" +#include namespace MMAP { diff --git a/src/server/collision/Management/MMapManager.h b/src/server/collision/Management/MMapManager.h index 7840921e4e6..798d0206538 100644 --- a/src/server/collision/Management/MMapManager.h +++ b/src/server/collision/Management/MMapManager.h @@ -19,17 +19,18 @@ #ifndef _MMAP_MANAGER_H #define _MMAP_MANAGER_H -#include "UnorderedMap.h" +#include "Define.h" #include "DetourAlloc.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" #include +#include // move map related classes namespace MMAP { - typedef UNORDERED_MAP MMapTileSet; - typedef UNORDERED_MAP NavMeshQuerySet; + typedef std::unordered_map MMapTileSet; + typedef std::unordered_map NavMeshQuerySet; // dummy struct to hold map's mmap data struct MMapData @@ -52,7 +53,7 @@ namespace MMAP }; - typedef UNORDERED_MAP MMapDataSet; + typedef std::unordered_map MMapDataSet; // singleton class // holds all all access to mmap loading unloading and meshes diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index abddd5d7cc3..711025e67c0 100644 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -19,9 +19,9 @@ #ifndef _VMAPMANAGER2_H #define _VMAPMANAGER2_H -#include "IVMapManager.h" -#include "Dynamic/UnorderedMap.h" #include "Define.h" +#include "IVMapManager.h" +#include #include //=========================================================== @@ -63,8 +63,8 @@ namespace VMAP int iRefCount; }; - typedef UNORDERED_MAP InstanceTreeMap; - typedef UNORDERED_MAP ModelFileMap; + typedef std::unordered_map InstanceTreeMap; + typedef std::unordered_map ModelFileMap; class VMapManager2 : public IVMapManager { diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 696935e4198..05351b74019 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -20,8 +20,8 @@ #define _MAPTREE_H #include "Define.h" -#include "Dynamic/UnorderedMap.h" #include "BoundingIntervalHierarchy.h" +#include namespace VMAP { @@ -39,8 +39,8 @@ namespace VMAP class StaticMapTree { - typedef UNORDERED_MAP loadedTileMap; - typedef UNORDERED_MAP loadedSpawnMap; + typedef std::unordered_map loadedTileMap; + typedef std::unordered_map loadedSpawnMap; private: uint32 iMapID; bool iIsTiled; diff --git a/src/server/collision/Models/GameObjectModel.cpp b/src/server/collision/Models/GameObjectModel.cpp index 42584693a13..1b99e282132 100644 --- a/src/server/collision/Models/GameObjectModel.cpp +++ b/src/server/collision/Models/GameObjectModel.cpp @@ -43,7 +43,7 @@ struct GameobjectModelData std::string name; }; -typedef UNORDERED_MAP ModelList; +typedef std::unordered_map ModelList; ModelList model_list; void LoadGameObjectModelList() diff --git a/src/server/game/AI/SmartScripts/SmartScript.h b/src/server/game/AI/SmartScripts/SmartScript.h index 244728a3037..b83222dc263 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.h +++ b/src/server/game/AI/SmartScripts/SmartScript.h @@ -231,7 +231,7 @@ class SmartScript SmartScriptType mScriptType; uint32 mEventPhase; - UNORDERED_MAP mStoredDecimals; + std::unordered_map mStoredDecimals; uint32 mPathId; SmartAIEventList mStoredEvents; std::listmRemIDs; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index 993e6967ba5..2e8453904a1 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -37,7 +37,7 @@ void SmartWaypointMgr::LoadFromDB() { uint32 oldMSTime = getMSTime(); - for (UNORDERED_MAP::iterator itr = waypoint_map.begin(); itr != waypoint_map.end(); ++itr) + for (std::unordered_map::iterator itr = waypoint_map.begin(); itr != waypoint_map.end(); ++itr) { for (WPPath::iterator pathItr = itr->second->begin(); pathItr != itr->second->end(); ++pathItr) delete pathItr->second; @@ -96,7 +96,7 @@ void SmartWaypointMgr::LoadFromDB() SmartWaypointMgr::~SmartWaypointMgr() { - for (UNORDERED_MAP::iterator itr = waypoint_map.begin(); itr != waypoint_map.end(); ++itr) + for (std::unordered_map::iterator itr = waypoint_map.begin(); itr != waypoint_map.end(); ++itr) { for (WPPath::iterator pathItr = itr->second->begin(); pathItr != itr->second->end(); ++pathItr) delete pathItr->second; diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.h b/src/server/game/AI/SmartScripts/SmartScriptMgr.h index 7ed9bbde2de..3d14b8f69e9 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.h +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.h @@ -1338,7 +1338,7 @@ struct SmartScriptHolder bool enableTimed; }; -typedef UNORDERED_MAP WPPath; +typedef std::unordered_map WPPath; typedef std::list ObjectList; typedef std::list GuidList; @@ -1392,7 +1392,7 @@ public: delete m_guidList; } }; -typedef UNORDERED_MAP ObjectListMap; +typedef std::unordered_map ObjectListMap; class SmartWaypointMgr { @@ -1411,14 +1411,14 @@ class SmartWaypointMgr } private: - UNORDERED_MAP waypoint_map; + std::unordered_map waypoint_map; }; // all events for a single entry typedef std::vector SmartAIEventList; // all events for all entries / guids -typedef UNORDERED_MAP SmartAIEventMap; +typedef std::unordered_map SmartAIEventMap; // Helper Stores typedef std::map > CacheSpellContainer; diff --git a/src/server/game/Achievements/AchievementMgr.h b/src/server/game/Achievements/AchievementMgr.h index 0a3e711e2ef..c3a1481bb2e 100644 --- a/src/server/game/Achievements/AchievementMgr.h +++ b/src/server/game/Achievements/AchievementMgr.h @@ -35,8 +35,8 @@ class WorldPacket; typedef std::vector AchievementCriteriaEntryList; typedef std::vector AchievementEntryList; -typedef UNORDERED_MAP AchievementCriteriaListByAchievement; -typedef UNORDERED_MAP AchievementListByReferencedId; +typedef std::unordered_map AchievementCriteriaListByAchievement; +typedef std::unordered_map AchievementListByReferencedId; struct CriteriaProgress { @@ -236,7 +236,7 @@ struct AchievementReward uint32 mailTemplate; }; -typedef UNORDERED_MAP AchievementRewards; +typedef std::unordered_map AchievementRewards; struct AchievementRewardLocale { @@ -244,7 +244,7 @@ struct AchievementRewardLocale std::vector text; }; -typedef UNORDERED_MAP AchievementRewardLocales; +typedef std::unordered_map AchievementRewardLocales; struct CompletedAchievementData { @@ -252,8 +252,8 @@ struct CompletedAchievementData bool changed; }; -typedef UNORDERED_MAP CriteriaProgressMap; -typedef UNORDERED_MAP CompletedAchievementMap; +typedef std::unordered_map CriteriaProgressMap; +typedef std::unordered_map CompletedAchievementMap; enum ProgressType { diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h index 506c4bea0c5..f45fc4100de 100644 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.h +++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h @@ -145,7 +145,7 @@ class AuctionHouseMgr public: - typedef UNORDERED_MAP ItemMap; + typedef std::unordered_map ItemMap; AuctionHouseObject* GetAuctionsMap(uint32 factionTemplateId); AuctionHouseObject* GetBidsMap(uint32 factionTemplateId); diff --git a/src/server/game/Battlegrounds/ArenaTeamMgr.h b/src/server/game/Battlegrounds/ArenaTeamMgr.h index 123cbe2d41b..946824fb656 100644 --- a/src/server/game/Battlegrounds/ArenaTeamMgr.h +++ b/src/server/game/Battlegrounds/ArenaTeamMgr.h @@ -27,7 +27,7 @@ class ArenaTeamMgr ~ArenaTeamMgr(); public: - typedef UNORDERED_MAP ArenaTeamContainer; + typedef std::unordered_map ArenaTeamContainer; ArenaTeam* GetArenaTeamById(uint32 arenaTeamId) const; ArenaTeam* GetArenaTeamByName(std::string const& arenaTeamName) const; diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.h b/src/server/game/Battlegrounds/BattlegroundMgr.h index 42803620e27..786e664c3f3 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.h +++ b/src/server/game/Battlegrounds/BattlegroundMgr.h @@ -28,7 +28,7 @@ typedef std::map BattlegroundContainer; typedef std::set BattlegroundClientIdsContainer; -typedef UNORDERED_MAP BattleMastersMap; +typedef std::unordered_map BattleMastersMap; #define BATTLEGROUND_ARENA_POINT_DISTRIBUTION_DAY 86400 // seconds in a day #define WS_ARENA_DISTRIBUTION_TIME 20001 // Custom worldstate diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h index 7d998997401..2c31fe37d4d 100644 --- a/src/server/game/DungeonFinding/LFGMgr.h +++ b/src/server/game/DungeonFinding/LFGMgr.h @@ -145,7 +145,7 @@ typedef std::map LfgProposalPlayerContainer; typedef std::map LfgPlayerBootContainer; typedef std::map LfgGroupDataContainer; typedef std::map LfgPlayerDataContainer; -typedef UNORDERED_MAP LFGDungeonContainer; +typedef std::unordered_map LFGDungeonContainer; // Data needed by SMSG_LFG_JOIN_RESULT struct LfgJoinResultData diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index 920c2623254..9cc08e3b71d 100644 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -170,7 +170,7 @@ struct CreatureTemplate }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP CreatureTemplateContainer; +typedef std::unordered_map CreatureTemplateContainer; // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push, N), also any gcc version not support it at some platform #if defined(__GNUC__) @@ -218,7 +218,7 @@ struct CreatureBaseStats static CreatureBaseStats const* GetBaseStats(uint8 level, uint8 unitClass); }; -typedef UNORDERED_MAP CreatureBaseStatsContainer; +typedef std::unordered_map CreatureBaseStatsContainer; struct CreatureLocale { @@ -243,8 +243,8 @@ struct EquipmentInfo }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP EquipmentInfoContainerInternal; -typedef UNORDERED_MAP EquipmentInfoContainer; +typedef std::unordered_map EquipmentInfoContainerInternal; +typedef std::unordered_map EquipmentInfoContainer; // from `creature` table struct CreatureData @@ -284,7 +284,7 @@ struct CreatureModelInfo }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP CreatureModelContainer; +typedef std::unordered_map CreatureModelContainer; enum InhabitTypeValues { @@ -325,7 +325,7 @@ struct CreatureAddon std::vector auras; }; -typedef UNORDERED_MAP CreatureAddonContainer; +typedef std::unordered_map CreatureAddonContainer; // Vendors struct VendorItem @@ -401,7 +401,7 @@ struct TrainerSpell bool IsCastable() const { return learnedSpell[0] != spell; } }; -typedef UNORDERED_MAP TrainerSpellMap; +typedef std::unordered_map TrainerSpellMap; struct TrainerSpellData { diff --git a/src/server/game/Entities/Creature/CreatureGroups.h b/src/server/game/Entities/Creature/CreatureGroups.h index 846b05abc17..b790853f5e1 100644 --- a/src/server/game/Entities/Creature/CreatureGroups.h +++ b/src/server/game/Entities/Creature/CreatureGroups.h @@ -20,7 +20,7 @@ #define _FORMATIONS_H #include "Define.h" -#include "UnorderedMap.h" +#include #include class Creature; @@ -36,7 +36,7 @@ struct FormationInfo uint16 point_2; }; -typedef UNORDERED_MAP CreatureGroupInfoType; +typedef std::unordered_map CreatureGroupInfoType; class FormationMgr { diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 979abebb2ea..e94bccc4835 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -538,7 +538,7 @@ struct GameObjectTemplate }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP GameObjectTemplateContainer; +typedef std::unordered_map GameObjectTemplateContainer; class OPvPCapturePoint; struct TransportAnimation; diff --git a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp index 3e31347a496..f5813ae0781 100644 --- a/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp +++ b/src/server/game/Entities/Item/ItemEnchantmentMgr.cpp @@ -40,7 +40,7 @@ struct EnchStoreItem }; typedef std::vector EnchStoreList; -typedef UNORDERED_MAP EnchantmentStore; +typedef std::unordered_map EnchantmentStore; static EnchantmentStore RandomItemEnch; diff --git a/src/server/game/Entities/Item/ItemPrototype.h b/src/server/game/Entities/Item/ItemPrototype.h index d411af218b1..cc477c5bd37 100644 --- a/src/server/game/Entities/Item/ItemPrototype.h +++ b/src/server/game/Entities/Item/ItemPrototype.h @@ -744,7 +744,7 @@ struct ItemTemplate }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP ItemTemplateContainer; +typedef std::unordered_map ItemTemplateContainer; struct ItemLocale { diff --git a/src/server/game/Entities/Object/Object.h b/src/server/game/Entities/Object/Object.h index 4dac0c7e87e..be35c91fbf4 100644 --- a/src/server/game/Entities/Object/Object.h +++ b/src/server/game/Entities/Object/Object.h @@ -116,7 +116,7 @@ class WorldObject; class WorldPacket; class ZoneScript; -typedef UNORDERED_MAP UpdateDataMapType; +typedef std::unordered_map UpdateDataMapType; class Object { diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 71f79c4935a..68465f6b8e7 100644 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -32,7 +32,7 @@ struct PetSpell PetSpellType type; }; -typedef UNORDERED_MAP PetSpellMap; +typedef std::unordered_map PetSpellMap; typedef std::vector AutoSpellList; class Player; diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index a3d8d0955ff..92691c3fd45 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -121,8 +121,8 @@ struct SpellModifier Aura* const ownerAura; }; -typedef UNORDERED_MAP PlayerTalentMap; -typedef UNORDERED_MAP PlayerSpellMap; +typedef std::unordered_map PlayerTalentMap; +typedef std::unordered_map PlayerSpellMap; typedef std::list SpellModList; typedef std::list WhisperListContainer; @@ -134,7 +134,7 @@ struct SpellCooldown }; typedef std::map SpellCooldowns; -typedef UNORDERED_MAP InstanceTimeMap; +typedef std::unordered_map InstanceTimeMap; enum TrainerSpellState { @@ -551,7 +551,7 @@ struct SkillStatusData SkillUpdateState uState; }; -typedef UNORDERED_MAP SkillStatusMap; +typedef std::unordered_map SkillStatusMap; class Quest; class Spell; @@ -1544,7 +1544,7 @@ class Player : public Unit, public GridObject uint8 unReadMails; time_t m_nextMailDelivereTime; - typedef UNORDERED_MAP ItemMap; + typedef std::unordered_map ItemMap; ItemMap mMitems; //template defined in objectmgr.cpp @@ -2169,7 +2169,7 @@ class Player : public Unit, public GridObject /*** INSTANCE SYSTEM ***/ /*********************************************************/ - typedef UNORDERED_MAP< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap; + typedef std::unordered_map< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap; void UpdateHomebindTime(uint32 time); @@ -2331,7 +2331,7 @@ class Player : public Unit, public GridObject //We allow only one timed quest active at the same time. Below can then be simple value instead of set. typedef std::set QuestSet; typedef std::set SeasonalQuestSet; - typedef UNORDERED_MAP SeasonalEventQuestMap; + typedef std::unordered_map SeasonalEventQuestMap; QuestSet m_timedquests; QuestSet m_weeklyquests; QuestSet m_monthlyquests; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 69c47ad99c1..70b35696205 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -17699,7 +17699,7 @@ void Unit::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns c data.Initialize(SMSG_SPELL_COOLDOWN, 8 + 1 + (4 + 4) * cooldowns.size()); data << uint64(GetGUID()); data << uint8(flags); - for (UNORDERED_MAP::const_iterator itr = cooldowns.begin(); itr != cooldowns.end(); ++itr) + for (std::unordered_map::const_iterator itr = cooldowns.begin(); itr != cooldowns.end(); ++itr) { data << uint32(itr->first); data << uint32(itr->second); diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 22c6d6b272e..9926403f7af 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1040,7 +1040,7 @@ struct GlobalCooldown uint32 cast_time; }; -typedef UNORDERED_MAP GlobalCooldownList; +typedef std::unordered_map GlobalCooldownList; class GlobalCooldownMgr // Shared by Player and CharmInfo { @@ -1247,7 +1247,7 @@ enum SpellCooldownFlags SPELL_COOLDOWN_FLAG_INCLUDE_EVENT_COOLDOWNS = 0x2 ///< Starts GCD for spells that should start their cooldown on events, requires SPELL_COOLDOWN_FLAG_INCLUDE_GCD set }; -typedef UNORDERED_MAP PacketCooldowns; +typedef std::unordered_map PacketCooldowns; // delay time next attack to prevent client attack animation problems #define ATTACK_DISPLAY_DELAY 200 diff --git a/src/server/game/Events/GameEventMgr.cpp b/src/server/game/Events/GameEventMgr.cpp index 95d4c7e2503..e4522536a81 100644 --- a/src/server/game/Events/GameEventMgr.cpp +++ b/src/server/game/Events/GameEventMgr.cpp @@ -1620,7 +1620,7 @@ uint16 GameEventMgr::GetEventIdForQuest(Quest const* quest) const if (!quest) return 0; - UNORDERED_MAP::const_iterator itr = _questToEventLinks.find(quest->GetQuestId()); + std::unordered_map::const_iterator itr = _questToEventLinks.find(quest->GetQuestId()); if (itr == _questToEventLinks.end()) return 0; diff --git a/src/server/game/Events/GameEventMgr.h b/src/server/game/Events/GameEventMgr.h index ea6f9359ea3..df062c6f660 100644 --- a/src/server/game/Events/GameEventMgr.h +++ b/src/server/game/Events/GameEventMgr.h @@ -173,7 +173,7 @@ class GameEventMgr QuestIdToEventConditionMap mQuestToEventConditions; GameEventNPCFlagMap mGameEventNPCFlags; ActiveEvents m_ActiveEvents; - UNORDERED_MAP _questToEventLinks; + std::unordered_map _questToEventLinks; bool isSystemInit; public: GameEventGuidMap mGameEventCreatureGuids; diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index ca173865570..8bf353d3eaa 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -431,7 +431,7 @@ void ObjectAccessor::UnloadAll() /// Define the static members of HashMapHolder -template UNORDERED_MAP< uint64, T* > HashMapHolder::m_objectMap; +template std::unordered_map< uint64, T* > HashMapHolder::m_objectMap; template typename HashMapHolder::LockType HashMapHolder::i_lock; /// Global definitions for the hashmap storage diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 4943c648b93..b52699c85ac 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -22,7 +22,7 @@ #include "Define.h" #include #include -#include "UnorderedMap.h" +#include #include "UpdateData.h" @@ -47,7 +47,7 @@ class HashMapHolder { public: - typedef UNORDERED_MAP MapType; + typedef std::unordered_map MapType; typedef ACE_RW_Thread_Mutex LockType; static void Insert(T* o) @@ -222,8 +222,8 @@ class ObjectAccessor static void _buildPacket(Player*, Object*, UpdateDataMapType&); void _update(); - typedef UNORDERED_MAP Player2CorpsesMapType; - typedef UNORDERED_MAP::value_type UpdateDataValueType; + typedef std::unordered_map Player2CorpsesMapType; + typedef std::unordered_map::value_type UpdateDataValueType; std::set i_objects; Player2CorpsesMapType i_player2corpse; diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 797d870aa62..7736d96ff4c 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -125,11 +125,11 @@ enum ScriptCommands SCRIPT_COMMAND_PLAYMOVIE = 34 // source = Player, datalong = movie id }; -// Benchmarked: Faster than UNORDERED_MAP (insert/find) +// Benchmarked: Faster than std::unordered_map (insert/find) typedef std::map PageTextContainer; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP InstanceTemplateContainer; +typedef std::unordered_map InstanceTemplateContainer; struct GameTele { @@ -142,7 +142,7 @@ struct GameTele std::wstring wnameLow; }; -typedef UNORDERED_MAP GameTeleContainer; +typedef std::unordered_map GameTeleContainer; enum ScriptsType { @@ -444,7 +444,7 @@ struct BroadcastText } }; -typedef UNORDERED_MAP BroadcastTextContainer; +typedef std::unordered_map BroadcastTextContainer; typedef std::set CellGuidSet; typedef std::map CellCorpseSet; @@ -454,8 +454,8 @@ struct CellObjectGuids CellGuidSet gameobjects; CellCorpseSet corpses; }; -typedef UNORDERED_MAP CellObjectGuidsMap; -typedef UNORDERED_MAP MapObjectGuids; +typedef std::unordered_map CellObjectGuidsMap; +typedef std::unordered_map MapObjectGuids; // Trinity string ranges #define MIN_TRINITY_STRING_ID 1 // 'trinity_string' @@ -472,19 +472,19 @@ struct TrinityStringLocale }; typedef std::map LinkedRespawnContainer; -typedef UNORDERED_MAP CreatureDataContainer; -typedef UNORDERED_MAP GameObjectDataContainer; +typedef std::unordered_map CreatureDataContainer; +typedef std::unordered_map GameObjectDataContainer; typedef std::map > TempSummonDataContainer; -typedef UNORDERED_MAP CreatureLocaleContainer; -typedef UNORDERED_MAP GameObjectLocaleContainer; -typedef UNORDERED_MAP ItemLocaleContainer; -typedef UNORDERED_MAP ItemSetNameLocaleContainer; -typedef UNORDERED_MAP QuestLocaleContainer; -typedef UNORDERED_MAP NpcTextLocaleContainer; -typedef UNORDERED_MAP PageTextLocaleContainer; -typedef UNORDERED_MAP TrinityStringLocaleContainer; -typedef UNORDERED_MAP GossipMenuItemsLocaleContainer; -typedef UNORDERED_MAP PointOfInterestLocaleContainer; +typedef std::unordered_map CreatureLocaleContainer; +typedef std::unordered_map GameObjectLocaleContainer; +typedef std::unordered_map ItemLocaleContainer; +typedef std::unordered_map ItemSetNameLocaleContainer; +typedef std::unordered_map QuestLocaleContainer; +typedef std::unordered_map NpcTextLocaleContainer; +typedef std::unordered_map PageTextLocaleContainer; +typedef std::unordered_map TrinityStringLocaleContainer; +typedef std::unordered_map GossipMenuItemsLocaleContainer; +typedef std::unordered_map PointOfInterestLocaleContainer; typedef std::multimap QuestRelations; typedef std::pair QuestRelationBounds; @@ -510,7 +510,7 @@ struct MailLevelReward }; typedef std::list MailLevelRewardList; -typedef UNORDERED_MAP MailLevelRewardContainer; +typedef std::unordered_map MailLevelRewardContainer; // We assume the rate is in general the same for all three types below, but chose to keep three for scalability and customization struct RepRewardRate @@ -612,7 +612,7 @@ struct QuestPOI }; typedef std::vector QuestPOIVector; -typedef UNORDERED_MAP QuestPOIContainer; +typedef std::unordered_map QuestPOIContainer; struct GraveYardData { @@ -624,8 +624,8 @@ typedef std::multimap GraveYardContainer; typedef std::pair GraveYardMapBounds; typedef std::pair GraveYardMapBoundsNonConst; -typedef UNORDERED_MAP CacheVendorItemContainer; -typedef UNORDERED_MAP CacheTrainerSpellContainer; +typedef std::unordered_map CacheVendorItemContainer; +typedef std::unordered_map CacheTrainerSpellContainer; enum SkillRangeType { @@ -673,7 +673,7 @@ struct DungeonEncounter }; typedef std::list DungeonEncounterList; -typedef UNORDERED_MAP DungeonEncounterContainer; +typedef std::unordered_map DungeonEncounterContainer; class PlayerDumpReader; @@ -687,21 +687,21 @@ class ObjectMgr ~ObjectMgr(); public: - typedef UNORDERED_MAP ItemMap; + typedef std::unordered_map ItemMap; - typedef UNORDERED_MAP QuestMap; + typedef std::unordered_map QuestMap; - typedef UNORDERED_MAP AreaTriggerContainer; + typedef std::unordered_map AreaTriggerContainer; - typedef UNORDERED_MAP AreaTriggerScriptContainer; + typedef std::unordered_map AreaTriggerScriptContainer; - typedef UNORDERED_MAP AccessRequirementContainer; + typedef std::unordered_map AccessRequirementContainer; - typedef UNORDERED_MAP RepRewardRateContainer; - typedef UNORDERED_MAP RepOnKillContainer; - typedef UNORDERED_MAP RepSpilloverTemplateContainer; + typedef std::unordered_map RepRewardRateContainer; + typedef std::unordered_map RepOnKillContainer; + typedef std::unordered_map RepSpilloverTemplateContainer; - typedef UNORDERED_MAP PointOfInterestContainer; + typedef std::unordered_map PointOfInterestContainer; typedef std::vector ScriptNameContainer; @@ -881,7 +881,7 @@ class ObjectMgr DungeonEncounterList const* GetDungeonEncounterList(uint32 mapId, Difficulty difficulty) { - UNORDERED_MAP::const_iterator itr = _dungeonEncounterStore.find(MAKE_PAIR32(mapId, difficulty)); + std::unordered_map::const_iterator itr = _dungeonEncounterStore.find(MAKE_PAIR32(mapId, difficulty)); if (itr != _dungeonEncounterStore.end()) return &itr->second; return NULL; @@ -1307,8 +1307,8 @@ class ObjectMgr QuestMap _questTemplates; - typedef UNORDERED_MAP GossipTextContainer; - typedef UNORDERED_MAP QuestAreaTriggerContainer; + typedef std::unordered_map GossipTextContainer; + typedef std::unordered_map QuestAreaTriggerContainer; typedef std::set TavernAreaTriggerContainer; typedef std::set GameObjectForQuestContainer; @@ -1389,7 +1389,7 @@ class ObjectMgr HalfNameContainer _petHalfName0; HalfNameContainer _petHalfName1; - typedef UNORDERED_MAP ItemSetNameContainer; + typedef std::unordered_map ItemSetNameContainer; ItemSetNameContainer _itemSetNameStore; MapObjectGuids _mapObjectGuidsStore; diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 64122b0cb4d..f0061a70621 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -171,7 +171,7 @@ class Group typedef std::list MemberSlotList; typedef MemberSlotList::const_iterator member_citerator; - typedef UNORDERED_MAP< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap; + typedef std::unordered_map< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap; protected: typedef MemberSlotList::iterator member_witerator; typedef std::set InvitesList; diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index fca483e92c3..ea0b2e44c53 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -637,7 +637,7 @@ private: void CanStoreItemInTab(Item* pItem, uint8 skipSlotId, bool merge, uint32& count); }; - typedef UNORDERED_MAP Members; + typedef std::unordered_map Members; typedef std::vector Ranks; typedef std::vector BankTabs; diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h index 3d07059000b..e8e6acb1bf0 100644 --- a/src/server/game/Guilds/GuildMgr.h +++ b/src/server/game/Guilds/GuildMgr.h @@ -43,7 +43,7 @@ public: void ResetTimes(); protected: - typedef UNORDERED_MAP GuildContainer; + typedef std::unordered_map GuildContainer; uint32 NextGuildId; GuildContainer GuildStore; }; diff --git a/src/server/game/Instances/InstanceSaveMgr.h b/src/server/game/Instances/InstanceSaveMgr.h index 1d753ebaa48..4f1b576cae6 100644 --- a/src/server/game/Instances/InstanceSaveMgr.h +++ b/src/server/game/Instances/InstanceSaveMgr.h @@ -24,7 +24,7 @@ #include #include #include -#include "UnorderedMap.h" +#include #include "DatabaseEnv.h" #include "DBCEnums.h" #include "ObjectDefines.h" @@ -140,7 +140,7 @@ class InstanceSave ACE_Thread_Mutex _lock; }; -typedef UNORDERED_MAP ResetTimeByMapDifficultyMap; +typedef std::unordered_map ResetTimeByMapDifficultyMap; class InstanceSaveManager { @@ -152,7 +152,7 @@ class InstanceSaveManager ~InstanceSaveManager(); public: - typedef UNORDERED_MAP InstanceSaveHashMap; + typedef std::unordered_map InstanceSaveHashMap; /* resetTime is a global propery of each (raid/heroic) map all instances of that map reset at the same time */ diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index fe21e4726ef..ed0f3b9717b 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -178,7 +178,7 @@ typedef std::vector QuestItemList; typedef std::vector LootItemList; typedef std::map QuestItemMap; typedef std::list LootStoreItemList; -typedef UNORDERED_MAP LootTemplateMap; +typedef std::unordered_map LootTemplateMap; typedef std::set LootIdSet; diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h index d965351fc79..a2d88905f50 100644 --- a/src/server/game/Maps/Map.h +++ b/src/server/game/Maps/Map.h @@ -256,7 +256,7 @@ struct ZoneDynamicInfo typedef std::map CreatureGroupHolderType; -typedef UNORDERED_MAP ZoneDynamicInfoMap; +typedef std::unordered_map ZoneDynamicInfoMap; class Map : public GridRefManager { @@ -482,7 +482,7 @@ class Map : public GridRefManager time_t GetLinkedRespawnTime(uint64 guid) const; time_t GetCreatureRespawnTime(uint32 dbGuid) const { - UNORDERED_MAP::const_iterator itr = _creatureRespawnTimes.find(dbGuid); + std::unordered_map::const_iterator itr = _creatureRespawnTimes.find(dbGuid); if (itr != _creatureRespawnTimes.end()) return itr->second; @@ -491,7 +491,7 @@ class Map : public GridRefManager time_t GetGORespawnTime(uint32 dbGuid) const { - UNORDERED_MAP::const_iterator itr = _goRespawnTimes.find(dbGuid); + std::unordered_map::const_iterator itr = _goRespawnTimes.find(dbGuid); if (itr != _goRespawnTimes.end()) return itr->second; @@ -658,8 +658,8 @@ class Map : public GridRefManager m_activeNonPlayers.erase(obj); } - UNORDERED_MAP _creatureRespawnTimes; - UNORDERED_MAP _goRespawnTimes; + std::unordered_map _creatureRespawnTimes; + std::unordered_map _goRespawnTimes; ZoneDynamicInfoMap _zoneDynamicInfo; uint32 _defaultLight; diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h index aa2b5f95d3f..30aec43cc21 100644 --- a/src/server/game/Maps/MapInstanced.h +++ b/src/server/game/Maps/MapInstanced.h @@ -27,7 +27,7 @@ class MapInstanced : public Map { friend class MapManager; public: - typedef UNORDERED_MAP< uint32, Map*> InstancedMaps; + typedef std::unordered_map< uint32, Map*> InstancedMaps; MapInstanced(uint32 id, time_t expiry); ~MapInstanced() { } diff --git a/src/server/game/Maps/MapManager.h b/src/server/game/Maps/MapManager.h index 98a5f8c7180..b7fb0617a46 100644 --- a/src/server/game/Maps/MapManager.h +++ b/src/server/game/Maps/MapManager.h @@ -126,7 +126,7 @@ class MapManager MapUpdater * GetMapUpdater() { return &m_updater; } private: - typedef UNORDERED_MAP MapMapType; + typedef std::unordered_map MapMapType; typedef std::vector InstanceIds; MapManager(); diff --git a/src/server/game/Maps/TransportMgr.h b/src/server/game/Maps/TransportMgr.h index a207522c4df..5da856b185c 100644 --- a/src/server/game/Maps/TransportMgr.h +++ b/src/server/game/Maps/TransportMgr.h @@ -31,10 +31,10 @@ class Map; typedef Movement::Spline TransportSpline; typedef std::vector KeyFrameVec; -typedef UNORDERED_MAP TransportTemplates; +typedef std::unordered_map TransportTemplates; typedef std::set TransportSet; -typedef UNORDERED_MAP TransportMap; -typedef UNORDERED_MAP > TransportInstanceMap; +typedef std::unordered_map TransportMap; +typedef std::unordered_map > TransportInstanceMap; struct KeyFrame { diff --git a/src/server/game/Movement/Waypoints/WaypointManager.h b/src/server/game/Movement/Waypoints/WaypointManager.h index fe7ca5ec931..bafc6322e71 100644 --- a/src/server/game/Movement/Waypoints/WaypointManager.h +++ b/src/server/game/Movement/Waypoints/WaypointManager.h @@ -34,7 +34,7 @@ struct WaypointData }; typedef std::vector WaypointPath; -typedef UNORDERED_MAP WaypointPathContainer; +typedef std::unordered_map WaypointPathContainer; class WaypointMgr { diff --git a/src/server/game/Scripting/ScriptSystem.h b/src/server/game/Scripting/ScriptSystem.h index af2e50bae36..11120f3031b 100644 --- a/src/server/game/Scripting/ScriptSystem.h +++ b/src/server/game/Scripting/ScriptSystem.h @@ -53,7 +53,7 @@ class SystemMgr ~SystemMgr() { } public: - typedef UNORDERED_MAP PointMoveMap; + typedef std::unordered_map PointMoveMap; //Database void LoadScriptWaypoints(); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 94c6f831ef6..9d1a05ae753 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -951,7 +951,7 @@ class WorldSession WorldSession* Session; private: - typedef UNORDERED_MAP OpcodeStatusMap; + typedef std::unordered_map OpcodeStatusMap; OpcodeStatusMap _isOpcodeAllowed; // could be bool array, but wouldn't be practical for game versions with non-linear opcodes Policy _policy; diff --git a/src/server/game/Skills/SkillDiscovery.cpp b/src/server/game/Skills/SkillDiscovery.cpp index 5e272edb531..e8a89039031 100644 --- a/src/server/game/Skills/SkillDiscovery.cpp +++ b/src/server/game/Skills/SkillDiscovery.cpp @@ -40,7 +40,7 @@ struct SkillDiscoveryEntry }; typedef std::list SkillDiscoveryList; -typedef UNORDERED_MAP SkillDiscoveryMap; +typedef std::unordered_map SkillDiscoveryMap; static SkillDiscoveryMap SkillDiscoveryStore; diff --git a/src/server/game/Spells/SpellMgr.h b/src/server/game/Spells/SpellMgr.h index 5f11870b3e9..acab7058c85 100644 --- a/src/server/game/Spells/SpellMgr.h +++ b/src/server/game/Spells/SpellMgr.h @@ -23,14 +23,15 @@ #include +#include "Define.h" #include "DBCStructure.h" #include "SharedDefines.h" -#include "UnorderedMap.h" #include "Util.h" #include #include #include +#include class SpellInfo; class Player; @@ -287,7 +288,7 @@ struct SpellProcEventEntry uint32 cooldown; // hidden cooldown used for some spell proc events, applied to _triggered_spell_ }; -typedef UNORDERED_MAP SpellProcEventMap; +typedef std::unordered_map SpellProcEventMap; struct SpellProcEntry { @@ -305,7 +306,7 @@ struct SpellProcEntry uint32 charges; // if nonzero - owerwrite procCharges field for given Spell.dbc entry, defines how many times proc can occur before aura remove, 0 - infinite }; -typedef UNORDERED_MAP SpellProcMap; +typedef std::unordered_map SpellProcMap; struct SpellEnchantProcEntry { @@ -314,7 +315,7 @@ struct SpellEnchantProcEntry uint32 procEx; }; -typedef UNORDERED_MAP SpellEnchantProcEventMap; +typedef std::unordered_map SpellEnchantProcEventMap; struct SpellBonusEntry { @@ -324,7 +325,7 @@ struct SpellBonusEntry float ap_dot_bonus; }; -typedef UNORDERED_MAP SpellBonusMap; +typedef std::unordered_map SpellBonusMap; enum SpellGroup { @@ -445,7 +446,7 @@ enum EffectRadiusIndex class PetAura { private: - typedef UNORDERED_MAP PetAuraMap; + typedef std::unordered_map PetAuraMap; public: PetAura() : removeOnChangePet(false), damage(0) { } @@ -525,7 +526,7 @@ struct SpellChainNode uint8 rank; }; -typedef UNORDERED_MAP SpellChainMap; +typedef std::unordered_map SpellChainMap; // spell_id req_spell typedef std::multimap SpellRequiredMap; diff --git a/src/server/game/Texts/CreatureTextMgr.h b/src/server/game/Texts/CreatureTextMgr.h index c3bc8966563..70b3f28d3d2 100644 --- a/src/server/game/Texts/CreatureTextMgr.h +++ b/src/server/game/Texts/CreatureTextMgr.h @@ -70,15 +70,15 @@ struct CreatureTextId }; typedef std::vector CreatureTextGroup; //texts in a group -typedef UNORDERED_MAP CreatureTextHolder; //groups for a creature by groupid -typedef UNORDERED_MAP CreatureTextMap; //all creatures by entry +typedef std::unordered_map CreatureTextHolder; //groups for a creature by groupid +typedef std::unordered_map CreatureTextMap; //all creatures by entry typedef std::map LocaleCreatureTextMap; //used for handling non-repeatable random texts typedef std::vector CreatureTextRepeatIds; -typedef UNORDERED_MAP CreatureTextRepeatGroup; -typedef UNORDERED_MAP CreatureTextRepeatMap;//guid based +typedef std::unordered_map CreatureTextRepeatGroup; +typedef std::unordered_map CreatureTextRepeatMap;//guid based class CreatureTextMgr { diff --git a/src/server/game/Weather/WeatherMgr.cpp b/src/server/game/Weather/WeatherMgr.cpp index 886a910becc..59dc591ccd0 100644 --- a/src/server/game/Weather/WeatherMgr.cpp +++ b/src/server/game/Weather/WeatherMgr.cpp @@ -34,8 +34,8 @@ namespace WeatherMgr namespace { - typedef UNORDERED_MAP > WeatherMap; - typedef UNORDERED_MAP WeatherZoneMap; + typedef std::unordered_map > WeatherMap; + typedef std::unordered_map WeatherZoneMap; WeatherMap m_weathers; WeatherZoneMap mWeatherZoneMap; diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h index 1557baf3bfa..9bac3032161 100644 --- a/src/server/game/World/World.h +++ b/src/server/game/World/World.h @@ -502,7 +502,7 @@ private: CliCommandHolder& operator=(CliCommandHolder const& right) = delete; }; -typedef UNORDERED_MAP SessionMap; +typedef std::unordered_map SessionMap; struct CharacterNameData { @@ -774,7 +774,7 @@ class World uint32 m_currentTime; SessionMap m_sessions; - typedef UNORDERED_MAP DisconnectMap; + typedef std::unordered_map DisconnectMap; DisconnectMap m_disconnects; uint32 m_maxActiveSessionCount; uint32 m_maxQueuedSessionCount; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index ceedf0024ad..35086afa42e 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -483,7 +483,7 @@ public: uint64 StomachEnterTarget; //Stomach map, bool = true then in stomach - UNORDERED_MAP Stomach_Map; + std::unordered_map Stomach_Map; void Reset() override { @@ -536,7 +536,7 @@ public: if (Stomach_Map.empty()) return NULL; - UNORDERED_MAP::const_iterator i = Stomach_Map.begin(); + std::unordered_map::const_iterator i = Stomach_Map.begin(); std::list temp; std::list::const_iterator j; @@ -680,7 +680,7 @@ public: DoCast(me, SPELL_PURPLE_COLORATION, true); - UNORDERED_MAP::iterator i = Stomach_Map.begin(); + std::unordered_map::iterator i = Stomach_Map.begin(); //Kick all players out of stomach while (i != Stomach_Map.end()) @@ -712,7 +712,7 @@ public: if (StomachAcidTimer <= diff) { //Apply aura to all players in stomach - UNORDERED_MAP::iterator i = Stomach_Map.begin(); + std::unordered_map::iterator i = Stomach_Map.begin(); while (i != Stomach_Map.end()) { diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index fb153f2ba3e..f49bbf0bada 100644 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -61,7 +61,7 @@ #include "Define.h" -#include "Dynamic/UnorderedMap.h" +#include #include #include #include diff --git a/src/server/shared/CompilerDefs.h b/src/server/shared/CompilerDefs.h index 8a557328af4..2c2d7ea861d 100644 --- a/src/server/shared/CompilerDefs.h +++ b/src/server/shared/CompilerDefs.h @@ -55,12 +55,4 @@ # error "FATAL ERROR: Unknown compiler." #endif -#if defined(__cplusplus) && __cplusplus == 201103L -# define COMPILER_HAS_CPP11_SUPPORT 1 -#elif _MSC_VER >= 1700 -# define COMPILER_HAS_CPP11_SUPPORT 1 -#else -# define COMPILER_HAS_CPP11_SUPPORT 0 -#endif - #endif diff --git a/src/server/shared/Dynamic/HashNamespace.h b/src/server/shared/Dynamic/HashNamespace.h deleted file mode 100644 index 0e95332c05f..00000000000 --- a/src/server/shared/Dynamic/HashNamespace.h +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright (C) 2008-2014 TrinityCore - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef TRINITY_HASH_NAMESPACE_H -#define TRINITY_HASH_NAMESPACE_H - -#include "Define.h" - -#if COMPILER_HAS_CPP11_SUPPORT -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#elif defined(_STLPORT_VERSION) -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600 // VS100 -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 -# define HASH_NAMESPACE_START namespace std { namespace tr1 { -# define HASH_NAMESPACE_END } } -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 -# define HASH_NAMESPACE_START namespace stdext { -# define HASH_NAMESPACE_END } - -#if !_HAS_TRADITIONAL_STL -#ifndef HASH_NAMESPACE -#define HASH_NAMESPACE -#else - -// can be not used by some platforms, so provide fake forward -HASH_NAMESPACE_START - -template -class hash -{ -public: - size_t operator() (K const&); -}; - -HASH_NAMESPACE_END - -#endif -#endif - -#elif COMPILER == COMPILER_INTEL -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#elif COMPILER == COMPILER_GNU && defined(__clang__) && defined(_LIBCPP_VERSION) -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#elif COMPILER == COMPILER_GNU && GCC_VERSION > 40200 -# define HASH_NAMESPACE_START namespace std { namespace tr1 { -# define HASH_NAMESPACE_END } } -#elif COMPILER == COMPILER_GNU && GCC_VERSION >= 30000 -# define HASH_NAMESPACE_START namespace __gnu_cxx { -# define HASH_NAMESPACE_END } - -#include -#include - -HASH_NAMESPACE_START - -template<> -class hash -{ -public: - size_t operator()(const unsigned long long &__x) const { return (size_t)__x; } -}; - -template -class hash -{ -public: - size_t operator()(T * const &__x) const { return (size_t)__x; } -}; - -template<> struct hash -{ - size_t operator()(const std::string &__x) const - { - return hash()(__x.c_str()); - } -}; - -HASH_NAMESPACE_END - -#else -# define HASH_NAMESPACE_START namespace std { -# define HASH_NAMESPACE_END } -#endif - -#if COMPILER != COMPILER_MICROSOFT - -// Visual Studio use non standard hash calculation function, so provide fake forward for other -HASH_NAMESPACE_START - -template -size_t hash_value(K const&); - -HASH_NAMESPACE_END - -#endif - -#endif diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index 4b17b2fc558..be7ce00ac05 100644 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -20,12 +20,12 @@ #define TRINITY_OBJECTREGISTRY_H #include "Define.h" -#include "Dynamic/UnorderedMap.h" #include #include #include #include +#include /** ObjectRegistry holds all registry item of the same type */ diff --git a/src/server/shared/Dynamic/UnorderedMap.h b/src/server/shared/Dynamic/UnorderedMap.h deleted file mode 100644 index f97c4830c75..00000000000 --- a/src/server/shared/Dynamic/UnorderedMap.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (C) 2008-2014 TrinityCore - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef TRINITY_UNORDERED_MAP_H -#define TRINITY_UNORDERED_MAP_H - -#include "HashNamespace.h" - -#if COMPILER_HAS_CPP11_SUPPORT -# include -#elif COMPILER == COMPILER_INTEL -# include -#elif COMPILER == COMPILER_GNU && defined(__clang__) && defined(_LIBCPP_VERSION) -# include -#elif COMPILER == COMPILER_GNU && GCC_VERSION > 40200 -# include -#elif COMPILER == COMPILER_GNU && GCC_VERSION >= 30000 -# include -#elif COMPILER == COMPILER_MICROSOFT && ((_MSC_VER >= 1500 && _HAS_TR1) || _MSC_VER >= 1700) // VC9.0 SP1 and later -# include -#else -# include -#endif - -#ifdef _STLPORT_VERSION -# define UNORDERED_MAP std::hash_map -# define UNORDERED_MULTIMAP std::hash_multimap -#elif COMPILER_HAS_CPP11_SUPPORT -# define UNORDERED_MAP std::unordered_map -# define UNORDERED_MULTIMAP std::unordered_multimap -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600 // VS100 -# define UNORDERED_MAP std::tr1::unordered_map -# define UNORDERED_MULTIMAP std::tr1::unordered_multimap -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 -# define UNORDERED_MAP std::tr1::unordered_map -# define UNORDERED_MULTIMAP std::tr1::unordered_multimap -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 -# define UNORDERED_MAP stdext::hash_map -# define UNORDERED_MULTIMAP stdext::hash_multimap -#elif COMPILER == COMPILER_INTEL -# define UNORDERED_MAP std::hash_map -# define UNORDERED_MULTIMAP std::hash_multimap -#elif COMPILER == COMPILER_GNU && defined(__clang__) && defined(_LIBCPP_VERSION) -# define UNORDERED_MAP std::unordered_map -# define UNORDERED_MULTIMAP std::unordered_multimap -#elif COMPILER == COMPILER_GNU && GCC_VERSION > 40200 -# define UNORDERED_MAP std::tr1::unordered_map -# define UNORDERED_MULTIMAP std::tr1::unordered_multimap -#elif COMPILER == COMPILER_GNU && GCC_VERSION >= 30000 -# define UNORDERED_MAP __gnu_cxx::hash_map -# define UNORDERED_MULTIMAP __gnu_cxx::hash_multimap -#else -# define UNORDERED_MAP std::hash_map -# define UNORDERED_MULTIMAP std::hash_multimap -#endif - -#endif diff --git a/src/server/shared/Dynamic/UnorderedSet.h b/src/server/shared/Dynamic/UnorderedSet.h deleted file mode 100644 index 0e084698c47..00000000000 --- a/src/server/shared/Dynamic/UnorderedSet.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2008-2014 TrinityCore - * Copyright (C) 2005-2009 MaNGOS - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along - * with this program. If not, see . - */ - -#ifndef TRINITY_UNORDERED_SET_H -#define TRINITY_UNORDERED_SET_H - -#include "HashNamespace.h" - -#if COMPILER_HAS_CPP11_SUPPORT -# include -#elif COMPILER == COMPILER_INTEL -# include -#elif COMPILER == COMPILER_GNU && defined(__clang__) && defined(_LIBCPP_VERSION) -# include -#elif COMPILER == COMPILER_GNU && GCC_VERSION > 40200 -# include -#elif COMPILER == COMPILER_GNU && GCC_VERSION >= 30000 -# include -#elif COMPILER == COMPILER_MICROSOFT && ((_MSC_VER >= 1500 && _HAS_TR1) || _MSC_VER >= 1700) // VC9.0 SP1 and later -# include -#else -# include -#endif - -#ifdef _STLPORT_VERSION -# define UNORDERED_SET std::hash_set -using std::hash_set; -#elif COMPILER_HAS_CPP11_SUPPORT -# define UNORDERED_SET std::unordered_set -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1600 // VS100 -# define UNORDERED_SET std::tr1::unordered_set -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1500 && _HAS_TR1 -# define UNORDERED_SET std::tr1::unordered_set -#elif COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1300 -# define UNORDERED_SET stdext::hash_set -using stdext::hash_set; -#elif COMPILER == COMPILER_INTEL -# define UNORDERED_SET std::hash_set -using std::hash_set; -#elif COMPILER == COMPILER_GNU && defined(__clang__) && defined(_LIBCPP_VERSION) -# define UNORDERED_SET std::unordered_set -#elif COMPILER == COMPILER_GNU && GCC_VERSION > 40200 -# define UNORDERED_SET std::tr1::unordered_set -#elif COMPILER == COMPILER_GNU && GCC_VERSION >= 30000 -# define UNORDERED_SET __gnu_cxx::hash_set -#else -# define UNORDERED_SET std::hash_set -using std::hash_set; -#endif - -#endif diff --git a/src/server/shared/Logging/Appender.h b/src/server/shared/Logging/Appender.h index b373f0459c9..84d0dc14eca 100644 --- a/src/server/shared/Logging/Appender.h +++ b/src/server/shared/Logging/Appender.h @@ -20,8 +20,7 @@ #include "Define.h" #include -#include "Dynamic/UnorderedMap.h" - +#include #include // Values assigned have their equivalent in enum ACE_Log_Priority @@ -105,6 +104,6 @@ class Appender AppenderFlags flags; }; -typedef UNORDERED_MAP AppenderMap; +typedef std::unordered_map AppenderMap; #endif diff --git a/src/server/shared/Logging/Log.h b/src/server/shared/Logging/Log.h index 73c5601b95b..5fa638e2f40 100644 --- a/src/server/shared/Logging/Log.h +++ b/src/server/shared/Logging/Log.h @@ -23,8 +23,8 @@ #include "Appender.h" #include "Logger.h" #include "LogWorker.h" -#include "Dynamic/UnorderedMap.h" +#include #include #include @@ -34,8 +34,8 @@ class Log { friend class ACE_Singleton; - typedef UNORDERED_MAP LoggerMap; - typedef UNORDERED_MAP CachedLoggerContainer; + typedef std::unordered_map LoggerMap; + typedef std::unordered_map CachedLoggerContainer; private: Log(); -- cgit v1.2.3