Core/Misc: Use std::scoped_lock instead of unique_lock where possible (and old lock_guard)

1 files changed, 8 insertions, 17 deletions

diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 33d36126b6d..7a2c9a5afb9 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -20,8 +20,6 @@
 #include "Map.h"
 #include "Metric.h"
 
-#include <mutex>
-
 class MapUpdateRequest
 {
     private:
@@ -48,9 +46,7 @@ class MapUpdateRequest
 void MapUpdater::activate(size_t num_threads)
 {
     for (size_t i = 0; i < num_threads; ++i)
-    {
-        _workerThreads.push_back(std::thread(&MapUpdater::WorkerThread, this));
-    }
+        _workerThreads.emplace_back(&MapUpdater::WorkerThread, this);
 }
 
 void MapUpdater::deactivate()
@@ -62,38 +58,33 @@ void MapUpdater::deactivate()
     _queue.Cancel();
 
     for (auto& thread : _workerThreads)
-    {
         thread.join();
-    }
 }
 
 void MapUpdater::wait()
 {
-    std::unique_lock<std::mutex> lock(_lock);
-
-    while (pending_requests > 0)
-        _condition.wait(lock);
+    std::unique_lock lock(_lock);
 
-    lock.unlock();
+    _condition.wait(lock, [&] { return pending_requests == 0; });
 }
 
 void MapUpdater::schedule_update(Map& map, uint32 diff)
 {
-    std::lock_guard<std::mutex> lock(_lock);
+    std::scoped_lock lock(_lock);
 
     ++pending_requests;
 
     _queue.Push(new MapUpdateRequest(map, *this, diff));
 }
 
-bool MapUpdater::activated()
+bool MapUpdater::activated() const
 {
-    return _workerThreads.size() > 0;
+    return !_workerThreads.empty();
 }
 
 void MapUpdater::update_finished()
 {
-    std::lock_guard<std::mutex> lock(_lock);
+    std::scoped_lock lock(_lock);
 
     --pending_requests;
 
@@ -107,7 +98,7 @@ void MapUpdater::WorkerThread()
     WorldDatabase.WarnAboutSyncQueries(true);
     HotfixDatabase.WarnAboutSyncQueries(true);
 
-    while (1)
+    while (true)
     {
         MapUpdateRequest* request = nullptr;