Swiftdiff options
| -rw-r--r-- | Swiften/Crypto/OpenSSLCryptoProvider.cpp | 6 | ||||
| -rw-r--r-- | Swiften/IDN/PlatformIDNConverter.cpp | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp index b46cb2a..e8c1c73 100644 --- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp +++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp @@ -1,7 +1,7 @@ /* - * Copyright (c) 2013-2017 Isode Limited. + * Copyright (c) 2013-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/Crypto/OpenSSLCryptoProvider.h> @@ -26,11 +26,11 @@ namespace { if (!SHA1_Init(&context)) { assert(false); } } - ~SHA1Hash() { + ~SHA1Hash() override { } virtual Hash& update(const ByteArray& data) override { return updateInternal(data); } @@ -67,11 +67,11 @@ namespace { if (!MD5_Init(&context)) { assert(false); } } - ~MD5Hash() { + ~MD5Hash() override { } virtual Hash& update(const ByteArray& data) override { return updateInternal(data); } diff --git a/Swiften/IDN/PlatformIDNConverter.cpp b/Swiften/IDN/PlatformIDNConverter.cpp index c85d3b6..c6104fb 100644 --- a/Swiften/IDN/PlatformIDNConverter.cpp +++ b/Swiften/IDN/PlatformIDNConverter.cpp @@ -1,7 +1,7 @@ /* - * Copyright (c) 2012-2016 Isode Limited. + * Copyright (c) 2012-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Swiften/IDN/PlatformIDNConverter.h> @@ -19,11 +19,12 @@ IDNConverter* PlatformIDNConverter::create() { #elif defined(HAVE_ICU) return new ICUConverter(); #else #if defined(NEED_IDN) #error "No IDN implementation" -#endif +#else return nullptr; #endif +#endif } } |