aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/shared/Threading/LockedQueue.h6
1 files changed, 2 insertions, 4 deletions
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;
}