[git] GPGME - branch, master, updated. gpgme-1.9.0-45-gfe79eb8

[by Andre Heinecke]

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  fe79eb8de3dc780eafb38a0a0a016748e764ff04 (commit)
       via  3b9123b4c64828acd2d2048f40d7631513aeab36 (commit)
      from  5c53c702605b8d4458a14e6303cdc13f3b106efa (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 fe79eb8de3dc780eafb38a0a0a016748e764ff04
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 10 17:27:24 2017 +0200

    Add isDeVs to ostream operator
    
    * lang/cpp/src/decryptionresult.cpp,
    lang/cpp/src/verificationresult.cpp: Extend ostream operator
    to include isDeVs.

diff --git a/lang/cpp/src/decryptionresult.cpp b/lang/cpp/src/decryptionresult.cpp
index d1c991b..1e815cb 100644
--- a/lang/cpp/src/decryptionresult.cpp
+++ b/lang/cpp/src/decryptionresult.cpp
@@ -230,6 +230,7 @@ std::ostream &GpgME::operator<<(std::ostream &os, const DecryptionResult &result
            << "\n fileName:             " << protect(result.fileName())
            << "\n unsupportedAlgorithm: " << protect(result.unsupportedAlgorithm())
            << "\n isWrongKeyUsage:      " << result.isWrongKeyUsage()
+           << "\n isDeVs                " << result.isDeVs()
            << "\n recipients:\n";
         const std::vector<DecryptionResult::Recipient> recipients = result.recipients();
         std::copy(recipients.begin(), recipients.end(),
diff --git a/lang/cpp/src/verificationresult.cpp b/lang/cpp/src/verificationresult.cpp
index 6dacd9f..2c42d07 100644
--- a/lang/cpp/src/verificationresult.cpp
+++ b/lang/cpp/src/verificationresult.cpp
@@ -590,6 +590,7 @@ std::ostream &GpgME::operator<<(std::ostream &os, const Signature &sig)
            << "\n publicKeyAlgorithm:        " << protect(sig.publicKeyAlgorithmAsString())
            << "\n hashAlgorithm:             " << protect(sig.hashAlgorithmAsString())
            << "\n policyURL:                 " << protect(sig.policyURL())
+           << "\n isDeVs                     " << sig.isDeVs()
            << "\n notations:\n";
         const std::vector<Notation> nota = sig.notations();
         std::copy(nota.begin(), nota.end(),

commit 3b9123b4c64828acd2d2048f40d7631513aeab36
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Mon Jul 10 17:26:46 2017 +0200

    Fix some shadow warnings
    
    --
    Warnings in headers hurt downstream.

diff --git a/lang/cpp/src/configuration.h b/lang/cpp/src/configuration.h
index 6717ea3..6993b6d 100644
--- a/lang/cpp/src/configuration.h
+++ b/lang/cpp/src/configuration.h
@@ -95,8 +95,8 @@ class GPGMEPP_EXPORT Component
 {
 public:
     Component() : comp() {}
-    explicit Component(const shared_gpgme_conf_comp_t &comp)
-        : comp(comp) {}
+    explicit Component(const shared_gpgme_conf_comp_t &gpgme_comp)
+        : comp(gpgme_comp) {}
 
     // copy ctor is ok
 
@@ -146,8 +146,8 @@ class GPGMEPP_EXPORT Option
 {
 public:
     Option() : comp(), opt(0) {}
-    Option(const shared_gpgme_conf_comp_t &comp, gpgme_conf_opt_t opt)
-        : comp(comp), opt(opt) {}
+    Option(const shared_gpgme_conf_comp_t &gpgme_comp, gpgme_conf_opt_t gpgme_opt)
+        : comp(gpgme_comp), opt(gpgme_opt) {}
 
     const Option &operator=(const Option &other)
     {

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

Summary of changes:
 lang/cpp/src/configuration.h        | 8 ++++----
 lang/cpp/src/decryptionresult.cpp   | 1 +
 lang/cpp/src/verificationresult.cpp | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)


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