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/collision/Management | |
| parent | 394ac748f8b468c97bcc008d32cc931829a524cb (diff) | |
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
Diffstat (limited to 'src/server/collision/Management')
| -rw-r--r-- | src/server/collision/Management/MMapFactory.h | 3 | ||||
| -rw-r--r-- | src/server/collision/Management/MMapManager.h | 9 | ||||
| -rw-r--r-- | src/server/collision/Management/VMapManager2.h | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/server/collision/Management/MMapFactory.h b/src/server/collision/Management/MMapFactory.h index 837c893f038..4b883d43613 100644 --- a/src/server/collision/Management/MMapFactory.h +++ b/src/server/collision/Management/MMapFactory.h @@ -19,11 +19,12 @@ #ifndef _MMAP_FACTORY_H #define _MMAP_FACTORY_H +#include "Define.h" #include "MMapManager.h" -#include "UnorderedMap.h" #include "DetourAlloc.h" #include "DetourNavMesh.h" #include "DetourNavMeshQuery.h" +#include <unordered_map> namespace MMAP { 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 diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index abddd5d7cc3..711025e67c0 100644 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -19,9 +19,9 @@ #ifndef _VMAPMANAGER2_H #define _VMAPMANAGER2_H -#include "IVMapManager.h" -#include "Dynamic/UnorderedMap.h" #include "Define.h" +#include "IVMapManager.h" +#include <unordered_map> #include <ace/Thread_Mutex.h> //=========================================================== @@ -63,8 +63,8 @@ namespace VMAP int iRefCount; }; - typedef UNORDERED_MAP<uint32, StaticMapTree*> InstanceTreeMap; - typedef UNORDERED_MAP<std::string, ManagedModel> ModelFileMap; + typedef std::unordered_map<uint32, StaticMapTree*> InstanceTreeMap; + typedef std::unordered_map<std::string, ManagedModel> ModelFileMap; class VMapManager2 : public IVMapManager { |