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/Session
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/Session')
-rw-r--r--Swiften/Session/BOSHSessionStream.cpp2
-rw-r--r--Swiften/Session/BOSHSessionStream.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index c5d0dd5..99af71d 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -67,7 +67,7 @@ BOSHSessionStream::BOSHSessionStream(const URL& boshURL,
}
BOSHSessionStream::~BOSHSessionStream() {
- close();
+ BOSHSessionStream::close();
connectionPool->onSessionTerminated.disconnect(boost::bind(&BOSHSessionStream::handlePoolSessionTerminated, this, _1));
connectionPool->onSessionStarted.disconnect(boost::bind(&BOSHSessionStream::handlePoolSessionStarted, this));
connectionPool->onXMPPDataRead.disconnect(boost::bind(&BOSHSessionStream::handlePoolXMPPDataRead, this, _1));
diff --git a/Swiften/Session/BOSHSessionStream.h b/Swiften/Session/BOSHSessionStream.h
index 817f5e9..191a6f4 100644
--- a/Swiften/Session/BOSHSessionStream.h
+++ b/Swiften/Session/BOSHSessionStream.h
@@ -49,7 +49,7 @@ namespace Swift {
const TLSOptions& tlsOptions,
boost::shared_ptr<HTTPTrafficFilter> trafficFilter
);
- ~BOSHSessionStream();
+ virtual ~BOSHSessionStream();
virtual void close();
virtual bool isOpen();