summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-11-04 08:31:06 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-11-09 16:05:25 (GMT)
commit526bbaf268851f8295a72f4ca8e6a97bcf43e37a (patch)
tree5d2b806ad73cfff026d0a084c9a384c900f96329 /Swiften/Network
parent879ca89f1df610f9de30e4396956d62ba5d4bdff (diff)
downloadswift-526bbaf268851f8295a72f4ca8e6a97bcf43e37a.zip
swift-526bbaf268851f8295a72f4ca8e6a97bcf43e37a.tar.bz2
Change virtual calls in ctors/dtors to be explicit
Test-Information: Still builds and tests pass on OS X 10.10.5. Change-Id: Ic616e7b9de443ce34b46de63ac1bb0cca34b08ee
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BOSHConnection.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index a9565c9..298b015 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -5,22 +5,23 @@
*/
/*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Network/BOSHConnection.h>
+#include <string>
+
#include <boost/bind.hpp>
-#include <boost/thread.hpp>
#include <boost/lexical_cast.hpp>
-#include <string>
+#include <boost/thread.hpp>
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/Concat.h>
#include <Swiften/Base/Log.h>
#include <Swiften/Base/String.h>
-#include <Swiften/Base/Concat.h>
-#include <Swiften/Base/ByteArray.h>
#include <Swiften/Network/HostAddressPort.h>
#include <Swiften/Parser/BOSHBodyExtractor.h>
@@ -44,7 +45,7 @@ BOSHConnection::~BOSHConnection() {
connection_->onDataRead.disconnect(boost::bind(&BOSHConnection::handleDataRead, shared_from_this(), _1));
connection_->onDisconnected.disconnect(boost::bind(&BOSHConnection::handleDisconnected, shared_from_this(), _1));
}
- disconnect();
+ BOSHConnection::disconnect();
}
void BOSHConnection::connect() {