summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-01-07 19:49:54 (GMT)
committerTobias Markmann <tm@ayena.de>2016-01-07 19:49:54 (GMT)
commite2d33e3c7ecb2e130093216cc6229c5b6ea5696a (patch)
tree8ff80c83119764e193d54884b960075a4ac696aa /Swiften/Network
parent832a6a33dbc15aade09a469d2801d222bb4171d7 (diff)
downloadswift-e2d33e3c7ecb2e130093216cc6229c5b6ea5696a.zip
swift-e2d33e3c7ecb2e130093216cc6229c5b6ea5696a.tar.bz2
Remove wrong assertion in BoostIOServiceThread
Test-Information: Builds and unit and system tests succeed on OS X 10.11.2. Change-Id: I9e4805f31c4ba63c64d73dbfc2ee6b6423d949a8
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BoostIOServiceThread.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/Network/BoostIOServiceThread.cpp b/Swiften/Network/BoostIOServiceThread.cpp
index 57b2cb4..af74c85 100644
--- a/Swiften/Network/BoostIOServiceThread.cpp
+++ b/Swiften/Network/BoostIOServiceThread.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.
*/
@@ -30,7 +30,6 @@ BoostIOServiceThread::~BoostIOServiceThread() {
}
void BoostIOServiceThread::doRun() {
- assert(thread_);
boost::asio::io_service::work work(*ioService_);
ioService_->run();
}