aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorleak <leak@bitmx.net>2014-06-08 16:05:23 +0200
committerleak <leak@bitmx.net>2014-06-08 16:05:23 +0200
commitfdd5e11a15a4e635bb1298c3d4c4b3c9e718e6b0 (patch)
tree20ce673a9422be296e67658d9a521dda13b30fa8
parentee4a3b9d59867a2440f8eb35f96405e5c4f6fe28 (diff)
Fix for LockedQueue.h (clean rebuilds ftw.)
-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;
}