summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2017-07-11 16:19:30 (GMT)
committerTobias Markmann <tm@ayena.de>2017-07-11 16:20:04 (GMT)
commite5111d0125ad107e12150e0cb5447209189c5338 (patch)
tree876a2f18e7da2e5d4c4bd605563b763f784f5935 /Swiften/Crypto
parent8b3082e5fa56540714f3ce9b72f87965a62b5d14 (diff)
downloadswift-e5111d0125ad107e12150e0cb5447209189c5338.zip
swift-e5111d0125ad107e12150e0cb5447209189c5338.tar.bz2
Add missing SWIFTEN_OVERRIDE statements to dtors
Also removes -Winconsistent-missing-destructor-override from the list of ignored clang warnings. Test-Information: Tested on macOS 10.12.5 with clang trunk. Change-Id: Iad951879e01eb951a2a393399f55e4e37437c6a2
Diffstat (limited to 'Swiften/Crypto')
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.cpp6
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.h4
-rw-r--r--Swiften/Crypto/OpenSSLCryptoProvider.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
index 9fbdb2a..63dfc4c 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -27,7 +27,7 @@ namespace {
}
}
- ~SHA1Hash() {
+ virtual ~SHA1Hash() SWIFTEN_OVERRIDE {
}
virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
@@ -68,7 +68,7 @@ namespace {
}
}
- ~MD5Hash() {
+ virtual ~MD5Hash() SWIFTEN_OVERRIDE {
}
virtual Hash& update(const ByteArray& data) SWIFTEN_OVERRIDE {
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.h b/Swiften/Crypto/CommonCryptoCryptoProvider.h
index 8fa7fa6..302410d 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.h
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -14,7 +14,7 @@ namespace Swift {
class SWIFTEN_API CommonCryptoCryptoProvider : public CryptoProvider {
public:
CommonCryptoCryptoProvider();
- ~CommonCryptoCryptoProvider();
+ virtual ~CommonCryptoCryptoProvider() SWIFTEN_OVERRIDE;
virtual Hash* createSHA1() SWIFTEN_OVERRIDE;
virtual Hash* createMD5() SWIFTEN_OVERRIDE;
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.h b/Swiften/Crypto/OpenSSLCryptoProvider.h
index 6e0c01b..24d7bd8 100644
--- a/Swiften/Crypto/OpenSSLCryptoProvider.h
+++ b/Swiften/Crypto/OpenSSLCryptoProvider.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2016 Isode Limited.
+ * Copyright (c) 2013-2017 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -13,7 +13,7 @@ namespace Swift {
class OpenSSLCryptoProvider : public CryptoProvider {
public:
OpenSSLCryptoProvider();
- ~OpenSSLCryptoProvider();
+ virtual ~OpenSSLCryptoProvider() SWIFTEN_OVERRIDE;
virtual Hash* createSHA1() SWIFTEN_OVERRIDE;
virtual Hash* createMD5() SWIFTEN_OVERRIDE;