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/Maps | |
| parent | 394ac748f8b468c97bcc008d32cc931829a524cb (diff) | |
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
Diffstat (limited to 'src/server/game/Maps')
| -rw-r--r-- | src/server/game/Maps/Map.h | 10 | ||||
| -rw-r--r-- | src/server/game/Maps/MapInstanced.h | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/MapManager.h | 2 | ||||
| -rw-r--r-- | src/server/game/Maps/TransportMgr.h | 6 |
4 files changed, 10 insertions, 10 deletions
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<uint32/*leaderDBGUID*/, CreatureGroup*> CreatureGroupHolderType; -typedef UNORDERED_MAP<uint32 /*zoneId*/, ZoneDynamicInfo> ZoneDynamicInfoMap; +typedef std::unordered_map<uint32 /*zoneId*/, ZoneDynamicInfo> ZoneDynamicInfoMap; class Map : public GridRefManager<NGridType> { @@ -482,7 +482,7 @@ class Map : public GridRefManager<NGridType> time_t GetLinkedRespawnTime(uint64 guid) const; time_t GetCreatureRespawnTime(uint32 dbGuid) const { - UNORDERED_MAP<uint32 /*dbGUID*/, time_t>::const_iterator itr = _creatureRespawnTimes.find(dbGuid); + std::unordered_map<uint32 /*dbGUID*/, time_t>::const_iterator itr = _creatureRespawnTimes.find(dbGuid); if (itr != _creatureRespawnTimes.end()) return itr->second; @@ -491,7 +491,7 @@ class Map : public GridRefManager<NGridType> time_t GetGORespawnTime(uint32 dbGuid) const { - UNORDERED_MAP<uint32 /*dbGUID*/, time_t>::const_iterator itr = _goRespawnTimes.find(dbGuid); + std::unordered_map<uint32 /*dbGUID*/, time_t>::const_iterator itr = _goRespawnTimes.find(dbGuid); if (itr != _goRespawnTimes.end()) return itr->second; @@ -658,8 +658,8 @@ class Map : public GridRefManager<NGridType> m_activeNonPlayers.erase(obj); } - UNORDERED_MAP<uint32 /*dbGUID*/, time_t> _creatureRespawnTimes; - UNORDERED_MAP<uint32 /*dbGUID*/, time_t> _goRespawnTimes; + std::unordered_map<uint32 /*dbGUID*/, time_t> _creatureRespawnTimes; + std::unordered_map<uint32 /*dbGUID*/, time_t> _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<uint32, Map*> MapMapType; + typedef std::unordered_map<uint32, Map*> MapMapType; typedef std::vector<bool> 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<double> TransportSpline; typedef std::vector<KeyFrame> KeyFrameVec; -typedef UNORDERED_MAP<uint32, TransportTemplate> TransportTemplates; +typedef std::unordered_map<uint32, TransportTemplate> TransportTemplates; typedef std::set<Transport*> TransportSet; -typedef UNORDERED_MAP<uint32, TransportSet> TransportMap; -typedef UNORDERED_MAP<uint32, std::set<uint32> > TransportInstanceMap; +typedef std::unordered_map<uint32, TransportSet> TransportMap; +typedef std::unordered_map<uint32, std::set<uint32> > TransportInstanceMap; struct KeyFrame { |
