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/VMapManager2.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/VMapManager2.h')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 { |