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/collision/Maps/MapTree.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/collision/Maps/MapTree.h')
| -rw-r--r-- | src/server/collision/Maps/MapTree.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <unordered_map> namespace VMAP { @@ -39,8 +39,8 @@ namespace VMAP class StaticMapTree { - typedef UNORDERED_MAP<uint32, bool> loadedTileMap; - typedef UNORDERED_MAP<uint32, uint32> loadedSpawnMap; + typedef std::unordered_map<uint32, bool> loadedTileMap; + typedef std::unordered_map<uint32, uint32> loadedSpawnMap; private: uint32 iMapID; bool iIsTiled; |