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/FileTransfer | |
| 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/FileTransfer')
| -rw-r--r-- | Swiften/FileTransfer/FileReadBytestream.h | 6 | ||||
| -rw-r--r-- | Swiften/FileTransfer/FileWriteBytestream.h | 6 | ||||
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/FileTransfer/FileReadBytestream.h b/Swiften/FileTransfer/FileReadBytestream.h index 16748d3..5ea197e 100644 --- a/Swiften/FileTransfer/FileReadBytestream.h +++ b/Swiften/FileTransfer/FileReadBytestream.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/filesystem/path.hpp> #include <boost/filesystem/fstream.hpp> +#include <boost/filesystem/path.hpp> #include <Swiften/Base/API.h> #include <Swiften/FileTransfer/ReadBytestream.h> @@ -16,7 +16,7 @@ namespace Swift { class SWIFTEN_API FileReadBytestream : public ReadBytestream { public: FileReadBytestream(const boost::filesystem::path& file); - ~FileReadBytestream(); + virtual ~FileReadBytestream(); virtual boost::shared_ptr< std::vector<unsigned char> > read(size_t size); virtual bool isFinished() const; diff --git a/Swiften/FileTransfer/FileWriteBytestream.h b/Swiften/FileTransfer/FileWriteBytestream.h index 4621932..b2d3347 100644 --- a/Swiften/FileTransfer/FileWriteBytestream.h +++ b/Swiften/FileTransfer/FileWriteBytestream.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2010 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <boost/filesystem/path.hpp> #include <boost/filesystem/fstream.hpp> +#include <boost/filesystem/path.hpp> #include <Swiften/Base/API.h> #include <Swiften/FileTransfer/WriteBytestream.h> @@ -16,7 +16,7 @@ namespace Swift { class SWIFTEN_API FileWriteBytestream : public WriteBytestream { public: FileWriteBytestream(const boost::filesystem::path& file); - ~FileWriteBytestream(); + virtual ~FileWriteBytestream(); virtual void write(const std::vector<unsigned char>&); void close(); diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h index 9820e34..e30db5e 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h @@ -50,7 +50,7 @@ namespace Swift { FileTransferTransporterFactory*, TimerFactory*, CryptoProvider*); - ~IncomingJingleFileTransfer(); + virtual ~IncomingJingleFileTransfer(); virtual void accept(boost::shared_ptr<WriteBytestream>, const FileTransferOptions& = FileTransferOptions()) SWIFTEN_OVERRIDE; virtual void cancel() SWIFTEN_OVERRIDE; |