[Pkg-gnupg-commit] [gpgme] 44/103: Fix some shadow warnings

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

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.
---
 lang/cpp/src/configuration.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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)
     {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git