diff options
| author | leak <leak@bitmx.net> | 2014-06-08 15:30:57 +0200 |
|---|---|---|
| committer | leak <leak@bitmx.net> | 2014-06-08 15:30:57 +0200 |
| commit | ee4a3b9d59867a2440f8eb35f96405e5c4f6fe28 (patch) | |
| tree | e6b3bb0b141565d8c0593e053466b8ccc629e93c /src/server/collision/Management/VMapManager2.h | |
| parent | 0fa3a4923efb492a71f888e256348148fdd73d80 (diff) | |
Replaced mutex related code in Common.h
Diffstat (limited to 'src/server/collision/Management/VMapManager2.h')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index 711025e67c0..03de6951d5d 100644 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -19,10 +19,10 @@ #ifndef _VMAPMANAGER2_H #define _VMAPMANAGER2_H +#include <mutex> +#include <unordered_map> #include "Define.h" #include "IVMapManager.h" -#include <unordered_map> -#include <ace/Thread_Mutex.h> //=========================================================== @@ -73,7 +73,7 @@ namespace VMAP ModelFileMap iLoadedModelFiles; InstanceTreeMap iInstanceMapTrees; // Mutex for iLoadedModelFiles - ACE_Thread_Mutex LoadedModelFilesLock; + std::mutex LoadedModelFilesLock; bool _loadMap(uint32 mapId, const std::string& basePath, uint32 tileX, uint32 tileY); /* void _unloadMap(uint32 pMapId, uint32 x, uint32 y); */ |