From 64194b0f8df1afe6135cd119fd3216fc8db68033 Mon Sep 17 00:00:00 2001
From: Andre Heinecke <aheinecke@intevation.de>
Date: Wed, 17 Aug 2016 07:23:05 +0200
Subject: 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.
---
 lang/cpp/src/result.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lang/cpp/src/result.h')

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)
     {
-- 
cgit v1.2.3