From fdd5e11a15a4e635bb1298c3d4c4b3c9e718e6b0 Mon Sep 17 00:00:00 2001
From: leak <leak@bitmx.net>
Date: Sun, 8 Jun 2014 16:05:23 +0200
Subject: Fix for LockedQueue.h (clean rebuilds ftw.)

---
 src/server/shared/Threading/LockedQueue.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/server/shared/Threading')

diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h
index 93225496df3..bbd60cb7760 100644
--- a/src/server/shared/Threading/LockedQueue.h
+++ b/src/server/shared/Threading/LockedQueue.h
@@ -103,17 +103,15 @@ public:
     //! Cancels the queue.
     void cancel()
     {
-        lock();
+        std::lock_guard<std::mutex> lock(_lock);
 
         _canceled = true;
-
-        unlock();
     }
 
     //! Checks if the queue is cancelled.
     bool cancelled()
     {
-        ACE_Guard<LockType> g(this->_lock);
+        std::lock_guard<std::mutex> lock(_lock);
         return _canceled;
     }
 
-- 
cgit v1.2.3