Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-04-08 08:40:49 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-04-12 14:12:45 (GMT) |
| commit | b9ad76af13fc1d253845e027f91f22039bf14f9c (patch) | |
| tree | c70d592a6bbbaae96e818e1de92e82e53390f393 /Swiften/Network/BoostTimer.cpp | |
| parent | 4e6713df2d55dc1b2970d9c3b619d2a415e1264f (diff) | |
| download | swift-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/Network/BoostTimer.cpp')
| -rw-r--r-- | Swiften/Network/BoostTimer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/BoostTimer.cpp b/Swiften/Network/BoostTimer.cpp index 846192c..a177504 100644 --- a/Swiften/Network/BoostTimer.cpp +++ b/Swiften/Network/BoostTimer.cpp @@ -21,14 +21,14 @@ BoostTimer::BoostTimer(int milliseconds, std::shared_ptr<boost::asio::io_service BoostTimer::~BoostTimer() { { - boost::mutex::scoped_lock lockTimer(timerMutex); + std::unique_lock<std::mutex> lockTimer(timerMutex); timer.reset(); } } void BoostTimer::start() { { - boost::mutex::scoped_lock lockTimer(timerMutex); + std::unique_lock<std::mutex> lockTimer(timerMutex); shuttingDown = false; timer->expires_from_now(boost::posix_time::milliseconds(timeout)); timer->async_wait(boost::bind(&BoostTimer::handleTimerTick, shared_from_this(), boost::asio::placeholders::error)); @@ -37,7 +37,7 @@ void BoostTimer::start() { void BoostTimer::stop() { { - boost::mutex::scoped_lock lockTimer(timerMutex); + std::unique_lock<std::mutex> lockTimer(timerMutex); shuttingDown = true; timer->cancel(); eventLoop->removeEventsFromOwner(shared_from_this()); @@ -50,7 +50,7 @@ void BoostTimer::handleTimerTick(const boost::system::error_code& error) { } else { { - boost::mutex::scoped_lock lockTimer(timerMutex); + std::unique_lock<std::mutex> lockTimer(timerMutex); if (shuttingDown) { return; } |