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/EventLoop/UnitTest | |
| 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/EventLoop/UnitTest')
| -rw-r--r-- | Swiften/EventLoop/UnitTest/EventLoopTest.cpp | 3 | ||||
| -rw-r--r-- | Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/EventLoop/UnitTest/EventLoopTest.cpp b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp index 55715d0..00a4376 100644 --- a/Swiften/EventLoop/UnitTest/EventLoopTest.cpp +++ b/Swiften/EventLoop/UnitTest/EventLoopTest.cpp @@ -4,8 +4,9 @@ * See the COPYING file for more information. */ +#include <thread> + #include <boost/bind.hpp> -#include <boost/thread.hpp> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> diff --git a/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp b/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp index 167fe45..3d096d3 100644 --- a/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp +++ b/Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp @@ -4,8 +4,9 @@ * See the COPYING file for more information. */ +#include <thread> + #include <boost/bind.hpp> -#include <boost/thread.hpp> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> @@ -30,7 +31,7 @@ class SimpleEventLoopTest : public CppUnit::TestFixture { void testRun() { SimpleEventLoop testling; - boost::thread thread(boost::bind(&SimpleEventLoopTest::runIncrementingThread, this, &testling)); + std::thread thread(boost::bind(&SimpleEventLoopTest::runIncrementingThread, this, &testling)); testling.run(); CPPUNIT_ASSERT_EQUAL(10, counter_); |