Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-13 22:03:37 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-01-15 13:41:45 (GMT) |
| commit | 730a9d26ef340373796aeb020175fce0ed716865 (patch) | |
| tree | 4de361c9bb98914ec67685237e68c4e9aa9acb42 /Swiften/Component | |
| parent | a85e554093966d7174218a17e45cf8e8b6efadca (diff) | |
| download | swift-730a9d26ef340373796aeb020175fce0ed716865.zip swift-730a9d26ef340373796aeb020175fce0ed716865.tar.bz2 | |
Add missing virtual keyword to some destructors
Adds missing virtual keyword to destructors of classes which
have a non-empty destructor and are inheriting from other
classes and implement virtual functions.
Test-Information:
Compiles and unit tests pass on Windows 8 with VS 2013.
Change-Id: I172b5de8eda63eb8057113fbc979444abde3e0a7
Diffstat (limited to 'Swiften/Component')
| -rw-r--r-- | Swiften/Component/Component.h | 7 | ||||
| -rw-r--r-- | Swiften/Component/CoreComponent.h | 19 |
2 files changed, 14 insertions, 12 deletions
diff --git a/Swiften/Component/Component.h b/Swiften/Component/Component.h index c399645..9d8b5d3 100644 --- a/Swiften/Component/Component.h +++ b/Swiften/Component/Component.h @@ -1,14 +1,15 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Base/API.h> #include <Swiften/Component/CoreComponent.h> +#include <Swiften/Base/API.h> + namespace Swift { class SoftwareVersionResponder; @@ -21,7 +22,7 @@ namespace Swift { class SWIFTEN_API Component : public CoreComponent { public: Component(const JID& jid, const std::string& secret, NetworkFactories* networkFactories); - ~Component(); + virtual ~Component(); /** * Sets the software version of the client. diff --git a/Swiften/Component/CoreComponent.h b/Swiften/Component/CoreComponent.h index 61571f2..12b38eb 100644 --- a/Swiften/Component/CoreComponent.h +++ b/Swiften/Component/CoreComponent.h @@ -1,28 +1,29 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once +#include <string> + #include <boost/shared_ptr.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Base/Error.h> +#include <Swiften/Base/SafeByteArray.h> +#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Component/ComponentConnector.h> -#include <Swiften/Component/ComponentSession.h> #include <Swiften/Component/ComponentError.h> -#include <Swiften/Elements/Presence.h> +#include <Swiften/Component/ComponentSession.h> +#include <Swiften/Component/ComponentSessionStanzaChannel.h> #include <Swiften/Elements/Message.h> +#include <Swiften/Elements/Presence.h> +#include <Swiften/Entity/Entity.h> #include <Swiften/JID/JID.h> -#include <string> #include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h> #include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h> -#include <Swiften/Component/ComponentSessionStanzaChannel.h> -#include <Swiften/Entity/Entity.h> -#include <Swiften/Base/SafeByteArray.h> namespace Swift { class EventLoop; @@ -44,7 +45,7 @@ namespace Swift { class SWIFTEN_API CoreComponent : public Entity { public: CoreComponent(const JID& jid, const std::string& secret, NetworkFactories* networkFactories); - ~CoreComponent(); + virtual ~CoreComponent(); void connect(const std::string& host, int port); void disconnect(); |