diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-05-17 14:20:35 +0200 |
| commit | 1094783715c16faf7553d2391b8bf23bfc51524d (patch) | |
| tree | 98ac29f4b341d05ff144492c66ba3406c30d136d /src/server/game/Maps/MapManager.h | |
| parent | 81b8deef529517a1f13397ff2aa13154bccf86c9 (diff) | |
| parent | 4136f3c974d2b08e1e9098fe9ab410db9a6aebd4 (diff) | |
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Maps/MapManager.h')
| -rw-r--r-- | src/server/game/Maps/MapManager.h | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |