diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2014-05-03 19:25:36 +0200 |
|---|---|---|
| committer | Aokromes <Aokromes@users.noreply.github.com> | 2014-05-03 19:25:36 +0200 |
| commit | d7b1405725d2f247776f3586df8c3512416f60cd (patch) | |
| tree | 3aced294b76f2e78b2d71b2d920297337b1249da /src/server/collision/Management/MMapManager.h | |
| parent | b7a105bcc86b4791e0deeaff7d8ba697821172ae (diff) | |
| parent | cbd36d5a4e97d41e56b7339a619ee1072fc9cc17 (diff) | |
Merge pull request #11968 from Dehravor/cpp11
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
Diffstat (limited to 'src/server/collision/Management/MMapManager.h')
| -rw-r--r-- | src/server/collision/Management/MMapManager.h | 9 |
1 files changed, 5 insertions, 4 deletions
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 <string> +#include <unordered_map> // move map related classes namespace MMAP { - typedef UNORDERED_MAP<uint32, dtTileRef> MMapTileSet; - typedef UNORDERED_MAP<uint32, dtNavMeshQuery*> NavMeshQuerySet; + typedef std::unordered_map<uint32, dtTileRef> MMapTileSet; + typedef std::unordered_map<uint32, dtNavMeshQuery*> NavMeshQuerySet; // dummy struct to hold map's mmap data struct MMapData @@ -52,7 +53,7 @@ namespace MMAP }; - typedef UNORDERED_MAP<uint32, MMapData*> MMapDataSet; + typedef std::unordered_map<uint32, MMapData*> MMapDataSet; // singleton class // holds all all access to mmap loading unloading and meshes |