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.cpp | |
| parent | 0fa3a4923efb492a71f888e256348148fdd73d80 (diff) | |
Replaced mutex related code in Common.h
Diffstat (limited to 'src/server/collision/Management/VMapManager2.cpp')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 813a3c04288..2aa3b6ab40d 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -18,6 +18,7 @@ #include <iostream> #include <iomanip> +#include <mutex> #include <string> #include <sstream> #include "VMapManager2.h" @@ -252,7 +253,7 @@ namespace VMAP WorldModel* VMapManager2::acquireModelInstance(const std::string& basepath, const std::string& filename) { //! Critical section, thread safe access to iLoadedModelFiles - TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); + std::lock_guard<std::mutex> lock(LoadedModelFilesLock); ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) @@ -275,7 +276,7 @@ namespace VMAP void VMapManager2::releaseModelInstance(const std::string &filename) { //! Critical section, thread safe access to iLoadedModelFiles - TRINITY_GUARD(ACE_Thread_Mutex, LoadedModelFilesLock); + std::lock_guard<std::mutex> lock(LoadedModelFilesLock); ModelFileMap::iterator model = iLoadedModelFiles.find(filename); if (model == iLoadedModelFiles.end()) |