From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 18 Sep 2020 06:48:10 +0000 (+0200)
Subject: Avoid -Wshadow warnings with older compilers
X-Git-Tag: v4.0~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ef9757297ac743a568ff0352a9f70f3cc8c22f3;p=thirdparty%2Fccache.git

Avoid -Wshadow warnings with older compilers
---

diff --git a/src/Statistics.cpp b/src/Statistics.cpp
index bfcdd9f47..84e230178 100644
--- a/src/Statistics.cpp
+++ b/src/Statistics.cpp
@@ -105,16 +105,16 @@ namespace {
 
 struct StatisticsField
 {
-  StatisticsField(Statistic statistic,
-                  const char* id,
-                  const char* message,
-                  unsigned flags = 0,
-                  FormatFunction format = nullptr)
-    : statistic(statistic),
-      id(id),
-      message(message),
-      flags(flags),
-      format(format)
+  StatisticsField(Statistic statistic_,
+                  const char* id_,
+                  const char* message_,
+                  unsigned flags_ = 0,
+                  FormatFunction format_ = nullptr)
+    : statistic(statistic_),
+      id(id_),
+      message(message_),
+      flags(flags_),
+      format(format_)
   {
   }
 
diff --git a/src/argprocessing.hpp b/src/argprocessing.hpp
index b8336fb08..6a34ab6af 100644
--- a/src/argprocessing.hpp
+++ b/src/argprocessing.hpp
@@ -46,16 +46,16 @@ struct ProcessArgsResult
   Args compiler_args;
 };
 
-inline ProcessArgsResult::ProcessArgsResult(Statistic error) : error(error)
+inline ProcessArgsResult::ProcessArgsResult(Statistic error_) : error(error_)
 {
 }
 
-inline ProcessArgsResult::ProcessArgsResult(Args preprocessor_args,
-                                            Args extra_args_to_hash,
-                                            Args compiler_args)
-  : preprocessor_args(preprocessor_args),
-    extra_args_to_hash(extra_args_to_hash),
-    compiler_args(compiler_args)
+inline ProcessArgsResult::ProcessArgsResult(Args preprocessor_args_,
+                                            Args extra_args_to_hash_,
+                                            Args compiler_args_)
+  : preprocessor_args(preprocessor_args_),
+    extra_args_to_hash(extra_args_to_hash_),
+    compiler_args(compiler_args_)
 {
 }