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/PlatformNATTraversalWorker.h | |
| 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/PlatformNATTraversalWorker.h')
| -rw-r--r-- | Swiften/Network/PlatformNATTraversalWorker.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/PlatformNATTraversalWorker.h b/Swiften/Network/PlatformNATTraversalWorker.h index 35f4ea6..3607dac 100644 --- a/Swiften/Network/PlatformNATTraversalWorker.h +++ b/Swiften/Network/PlatformNATTraversalWorker.h @@ -12,13 +12,13 @@ #pragma once +#include <condition_variable> #include <deque> +#include <mutex> +#include <thread> #include <boost/logic/tribool.hpp> #include <boost/optional.hpp> -#include <boost/thread/condition_variable.hpp> -#include <boost/thread/mutex.hpp> -#include <boost/thread/thread.hpp> #include <Swiften/Base/API.h> #include <Swiften/Base/Atomic.h> @@ -61,10 +61,10 @@ namespace Swift { private: EventLoop* eventLoop; Atomic<bool> stopRequested; - boost::thread* thread; + std::thread* thread; std::deque<std::shared_ptr<PlatformNATTraversalRequest> > queue; - boost::mutex queueMutex; - boost::condition_variable queueNonEmpty; + std::mutex queueMutex; + std::condition_variable queueNonEmpty; NullNATTraversalInterface* nullNATTraversalInterface; mutable boost::logic::tribool natPMPSupported; |