[git] GPGME - branch, master, updated. gpgme-1.6.0-289-g64194b0

by Andre Heinecke cvs at cvs.gnupg.org
Wed Aug 17 07:25:02 CEST 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  64194b0f8df1afe6135cd119fd3216fc8db68033 (commit)
      from  8c09dd9989bcd434a8cb5997770cb8414b96bd5c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64194b0f8df1afe6135cd119fd3216fc8db68033
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Aug 17 07:23:05 2016 +0200

    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.

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 1a2741e..11080cf 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 7d7f53a..29eba91 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 1eae5b1..a86d81f 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)
     {

-----------------------------------------------------------------------

Summary of changes:
 lang/cpp/src/context.cpp | 2 +-
 lang/cpp/src/context.h   | 2 +-
 lang/cpp/src/result.h    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list