summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-04-08 08:40:49 (GMT)
committerTobias Markmann <tm@ayena.de>2016-04-12 14:12:45 (GMT)
commitb9ad76af13fc1d253845e027f91f22039bf14f9c (patch)
treec70d592a6bbbaae96e818e1de92e82e53390f393 /Swiften/EventLoop/SimpleEventLoop.cpp
parent4e6713df2d55dc1b2970d9c3b619d2a415e1264f (diff)
downloadswift-b9ad76af13fc1d253845e027f91f22039bf14f9c.zip
swift-b9ad76af13fc1d253845e027f91f22039bf14f9c.tar.bz2
Use C++11 threading library instead of Boost.Thread
This cuts down our dependency on Boost further. Another benefit is that mutex classes of C++11 standard library are recognized by TSAN. Test-Information: Unit and integration tests pass on OS X 10.11.4. Change-Id: Id4dcdb42e3d5155e107ce1d7618acbf26f913b6f
Diffstat (limited to 'Swiften/EventLoop/SimpleEventLoop.cpp')
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/EventLoop/SimpleEventLoop.cpp b/Swiften/EventLoop/SimpleEventLoop.cpp
index 37fecd9..2397016 100644
--- a/Swiften/EventLoop/SimpleEventLoop.cpp
+++ b/Swiften/EventLoop/SimpleEventLoop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -21,7 +21,7 @@ SimpleEventLoop::~SimpleEventLoop() {
void SimpleEventLoop::doRun(bool breakAfterEvents) {
while (isRunning_) {
{
- boost::unique_lock<boost::mutex> lock(eventAvailableMutex_);
+ std::unique_lock<std::mutex> lock(eventAvailableMutex_);
while (!eventAvailable_) {
eventAvailableCondition_.wait(lock);
}
@@ -49,7 +49,7 @@ void SimpleEventLoop::doStop() {
void SimpleEventLoop::eventPosted() {
{
- boost::unique_lock<boost::mutex> lock(eventAvailableMutex_);
+ std::unique_lock<std::mutex> lock(eventAvailableMutex_);
eventAvailable_ = true;
}
eventAvailableCondition_.notify_one();