From 7032ee0bdb47c995dfd89bce3d5b6fad13ec6d73 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Sat, 18 Jul 2020 16:34:45 +0000 Subject: Core/Misc: Replace boost::shared_mutex with std::shared_mutex (#24328) * Core/Misc: Replace boost::shared_mutex with std::shared_mutex * Remove std forward declarations --- src/server/scripts/Commands/cs_gm.cpp | 4 +--- src/server/scripts/Commands/cs_reset.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index cbb5ef30b09..f6c0b021367 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -33,8 +33,6 @@ EndScriptData */ #include "Realm.h" #include "World.h" #include "WorldSession.h" -#include -#include class gm_commandscript : public CommandScript { @@ -126,7 +124,7 @@ public: bool first = true; bool footer = false; - boost::shared_lock lock(*HashMapHolder::GetLock()); + std::shared_lock lock(*HashMapHolder::GetLock()); HashMapHolder::MapType const& m = ObjectAccessor::GetPlayers(); for (HashMapHolder::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp index 38b56fc2e09..06fb01f2ba9 100644 --- a/src/server/scripts/Commands/cs_reset.cpp +++ b/src/server/scripts/Commands/cs_reset.cpp @@ -34,8 +34,6 @@ EndScriptData */ #include "RBAC.h" #include "World.h" #include "WorldSession.h" -#include -#include class reset_commandscript : public CommandScript { @@ -302,7 +300,7 @@ public: stmt->setUInt16(0, uint16(atLogin)); CharacterDatabase.Execute(stmt); - boost::shared_lock lock(*HashMapHolder::GetLock()); + std::shared_lock lock(*HashMapHolder::GetLock()); HashMapHolder::MapType const& plist = ObjectAccessor::GetPlayers(); for (HashMapHolder::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) itr->second->SetAtLoginFlag(atLogin); -- cgit v1.2.3