diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-07-18 16:34:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 18:34:45 +0200 |
| commit | 7032ee0bdb47c995dfd89bce3d5b6fad13ec6d73 (patch) | |
| tree | 1fef6be72920c2c6e1979ef19dabfc59360bdd27 /src/server/scripts/Commands | |
| parent | c54dc3ef9273378c55e0c17acef18de731a7f8eb (diff) | |
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
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_gm.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_reset.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
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 <boost/thread/locks.hpp> -#include <boost/thread/shared_mutex.hpp> class gm_commandscript : public CommandScript { @@ -126,7 +124,7 @@ public: bool first = true; bool footer = false; - boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); + std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& m = ObjectAccessor::GetPlayers(); for (HashMapHolder<Player>::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 <boost/thread/locks.hpp> -#include <boost/thread/shared_mutex.hpp> class reset_commandscript : public CommandScript { @@ -302,7 +300,7 @@ public: stmt->setUInt16(0, uint16(atLogin)); CharacterDatabase.Execute(stmt); - boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); + std::shared_lock<std::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); HashMapHolder<Player>::MapType const& plist = ObjectAccessor::GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) itr->second->SetAtLoginFlag(atLogin); |