diff options
author | Andre Heinecke <[email protected]> | 2016-08-17 05:23:05 +0000 |
---|---|---|
committer | Andre Heinecke <[email protected]> | 2016-08-17 05:23:05 +0000 |
commit | 64194b0f8df1afe6135cd119fd3216fc8db68033 (patch) | |
tree | cb5a211fd950fe8c5554238d9c2d731da432ead1 /lang/cpp | |
parent | core: New global flag "require-gnupg". (diff) | |
download | gpgme-64194b0f8df1afe6135cd119fd3216fc8db68033.tar.gz gpgme-64194b0f8df1afe6135cd119fd3216fc8db68033.zip |
Cpp: Fix some pedantic warnings
* lang/cpp/src/context.cpp,
lang/cpp/src/context.h (Context::getKeysFromRecipients): Remove
ignored / invalid const qualifier.
* lang/cpp/src/result.h: Don't shadow error function in ctor.
Diffstat (limited to 'lang/cpp')
-rw-r--r-- | lang/cpp/src/context.cpp | 2 | ||||
-rw-r--r-- | lang/cpp/src/context.h | 2 | ||||
-rw-r--r-- | lang/cpp/src/result.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp index 1a2741eb..11080cfa 100644 --- a/lang/cpp/src/context.cpp +++ b/lang/cpp/src/context.cpp @@ -1109,7 +1109,7 @@ static gpgme_encrypt_flags_t encryptflags2encryptflags(Context::EncryptionFlags return static_cast<gpgme_encrypt_flags_t>(result); } -gpgme_key_t *const Context::getKeysFromRecipients(const std::vector<Key> &recipients) +gpgme_key_t *Context::getKeysFromRecipients(const std::vector<Key> &recipients) { if (recipients.empty()) { return nullptr; diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h index 7d7f53a6..29eba91b 100644 --- a/lang/cpp/src/context.h +++ b/lang/cpp/src/context.h @@ -371,7 +371,7 @@ public: private: // Helper functions that need to be context because they rely // on the "Friendlyness" of context to access the gpgme types. - gpgme_key_t *const getKeysFromRecipients(const std::vector<Key> &recipients); + gpgme_key_t *getKeysFromRecipients(const std::vector<Key> &recipients); private: Private *const d; diff --git a/lang/cpp/src/result.h b/lang/cpp/src/result.h index 1eae5b1d..a86d81f0 100644 --- a/lang/cpp/src/result.h +++ b/lang/cpp/src/result.h @@ -35,8 +35,8 @@ class GPGMEPP_EXPORT Result { protected: explicit Result() : mError() {} - explicit Result(int error) : mError(error) {} - explicit Result(const Error &error) : mError(error) {} + explicit Result(int err) : mError(err) {} + explicit Result(const Error &err) : mError(err) {} void swap(Result &other) { |