diff options
| author | Dehravor <dehravor@gmail.com> | 2014-05-01 10:10:13 +0200 |
|---|---|---|
| committer | Dehravor <dehravor@gmail.com> | 2014-05-01 11:19:32 +0200 |
| commit | cbd36d5a4e97d41e56b7339a619ee1072fc9cc17 (patch) | |
| tree | a11c241df20b414f0f592597953c794cb0621b5f /src/server/game/Entities/Creature | |
| parent | 394ac748f8b468c97bcc008d32cc931829a524cb (diff) | |
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
Diffstat (limited to 'src/server/game/Entities/Creature')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.h | 14 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/CreatureGroups.h | 4 |
2 files changed, 9 insertions, 9 deletions
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<uint32, CreatureTemplate> CreatureTemplateContainer; +typedef std::unordered_map<uint32, CreatureTemplate> 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<uint16, CreatureBaseStats> CreatureBaseStatsContainer; +typedef std::unordered_map<uint16, CreatureBaseStats> CreatureBaseStatsContainer; struct CreatureLocale { @@ -243,8 +243,8 @@ struct EquipmentInfo }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP<uint8, EquipmentInfo> EquipmentInfoContainerInternal; -typedef UNORDERED_MAP<uint32, EquipmentInfoContainerInternal> EquipmentInfoContainer; +typedef std::unordered_map<uint8, EquipmentInfo> EquipmentInfoContainerInternal; +typedef std::unordered_map<uint32, EquipmentInfoContainerInternal> EquipmentInfoContainer; // from `creature` table struct CreatureData @@ -284,7 +284,7 @@ struct CreatureModelInfo }; // Benchmarked: Faster than std::map (insert/find) -typedef UNORDERED_MAP<uint16, CreatureModelInfo> CreatureModelContainer; +typedef std::unordered_map<uint16, CreatureModelInfo> CreatureModelContainer; enum InhabitTypeValues { @@ -325,7 +325,7 @@ struct CreatureAddon std::vector<uint32> auras; }; -typedef UNORDERED_MAP<uint32, CreatureAddon> CreatureAddonContainer; +typedef std::unordered_map<uint32, CreatureAddon> CreatureAddonContainer; // Vendors struct VendorItem @@ -401,7 +401,7 @@ struct TrainerSpell bool IsCastable() const { return learnedSpell[0] != spell; } }; -typedef UNORDERED_MAP<uint32 /*spellid*/, TrainerSpell> TrainerSpellMap; +typedef std::unordered_map<uint32 /*spellid*/, TrainerSpell> 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 <unordered_map> #include <map> class Creature; @@ -36,7 +36,7 @@ struct FormationInfo uint16 point_2; }; -typedef UNORDERED_MAP<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType; +typedef std::unordered_map<uint32/*memberDBGUID*/, FormationInfo*> CreatureGroupInfoType; class FormationMgr { |