Avoid -Wshadow warnings with older compilers

diff --git a/src/Statistics.cpp b/src/Statistics.cpp
index bfcdd9f475ef814976acd042ae8547a8bdd11b0e..84e2301789f47b3f86a8d452b0ddfe4c5fde74a3 100644 (file)
--- 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 b8336fb08242caada0d9a8c63f3e09e32351fb3f..6a34ab6af953ea81421c9975077243f34f044843 100644 (file)
--- 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_)
 {
 }