Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced mutex related code in Common.h

Browse Source
This commit is contained in:
leak
2014-06-08 15:30:57 +02:00
parent 0fa3a4923e
commit ee4a3b9d59
19 changed files with 142 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/collision/Management/VMapManager2.cpp
View File

@@ -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())