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/Crypto | |
| 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/Crypto')
| -rw-r--r-- | Swiften/Crypto/WindowsCryptoProvider.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Crypto/WindowsCryptoProvider.h | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/Crypto/WindowsCryptoProvider.cpp b/Swiften/Crypto/WindowsCryptoProvider.cpp index a6ae7a4..db4b2bf 100644 --- a/Swiften/Crypto/WindowsCryptoProvider.cpp +++ b/Swiften/Crypto/WindowsCryptoProvider.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012 Isode Limited. + * Copyright (c) 2012-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -39,7 +39,7 @@ namespace { } } - ~WindowsHash() { + virtual ~WindowsHash() { CryptDestroyHash(hash); } diff --git a/Swiften/Crypto/WindowsCryptoProvider.h b/Swiften/Crypto/WindowsCryptoProvider.h index bd06b6e..b3f6f29 100644 --- a/Swiften/Crypto/WindowsCryptoProvider.h +++ b/Swiften/Crypto/WindowsCryptoProvider.h @@ -1,21 +1,22 @@ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once -#include <Swiften/Crypto/CryptoProvider.h> -#include <Swiften/Base/Override.h> #include <boost/noncopyable.hpp> #include <boost/shared_ptr.hpp> +#include <Swiften/Base/Override.h> +#include <Swiften/Crypto/CryptoProvider.h> + namespace Swift { class WindowsCryptoProvider : public CryptoProvider, public boost::noncopyable { public: WindowsCryptoProvider(); - ~WindowsCryptoProvider(); + virtual ~WindowsCryptoProvider(); virtual Hash* createSHA1() SWIFTEN_OVERRIDE; virtual Hash* createMD5() SWIFTEN_OVERRIDE; |