summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-28 23:15:59 (GMT)
committerSwift Review <review@swift.im>2014-10-30 14:55:11 (GMT)
commit4041cc4dd4f0abc6641fed5890120efa691a27ca (patch)
tree8c9eb101469f453556314c23bcec57f680419c4e /Swiften/Crypto
parent6e87ef3a842094483105df4e6333c90964a69a47 (diff)
downloadswift-4041cc4dd4f0abc6641fed5890120efa691a27ca.zip
swift-4041cc4dd4f0abc6641fed5890120efa691a27ca.tar.bz2
Add missing virtual and SWIFTEN_OVERRIDE annotations to reduce warnings with C++11.
Test-Information: Tested with Clang 3.6.0. Change-Id: I1f9ae8ae535d90f92b7263e86b51fe64b15524b4
Diffstat (limited to 'Swiften/Crypto')
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.cpp4
-rw-r--r--Swiften/Crypto/OpenSSLCryptoProvider.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
index 14f9284..4cb746f 100644
--- a/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
+++ b/Swiften/Crypto/CommonCryptoCryptoProvider.cpp
@@ -36,7 +36,7 @@ namespace {
return updateInternal(data);
}
- virtual std::vector<unsigned char> getHash() {
+ virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
assert(!finalized);
std::vector<unsigned char> result(CC_SHA1_DIGEST_LENGTH);
CC_SHA1_Final(vecptr(result), &context);
@@ -77,7 +77,7 @@ namespace {
return updateInternal(data);
}
- virtual std::vector<unsigned char> getHash() {
+ virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
assert(!finalized);
std::vector<unsigned char> result(CC_MD5_DIGEST_LENGTH);
CC_MD5_Final(vecptr(result), &context);
diff --git a/Swiften/Crypto/OpenSSLCryptoProvider.cpp b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
index 9b1d544..41b4564 100644
--- a/Swiften/Crypto/OpenSSLCryptoProvider.cpp
+++ b/Swiften/Crypto/OpenSSLCryptoProvider.cpp
@@ -39,7 +39,7 @@ namespace {
return updateInternal(data);
}
- virtual std::vector<unsigned char> getHash() {
+ virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
assert(!finalized);
std::vector<unsigned char> result(SHA_DIGEST_LENGTH);
SHA1_Final(vecptr(result), &context);
@@ -80,7 +80,7 @@ namespace {
return updateInternal(data);
}
- virtual std::vector<unsigned char> getHash() {
+ virtual std::vector<unsigned char> getHash() SWIFTEN_OVERRIDE {
assert(!finalized);
std::vector<unsigned char> result(MD5_DIGEST_LENGTH);
MD5_Final(vecptr(result), &context);