From: Joel Brobecker <brobecker@gnat.com>
Date: Wed, 23 Nov 2011 19:54:08 +0000 (+0000)
Subject: fix -Wshadow warning inside ada-lang.c:assign_aggregate
X-Git-Tag: gdb_7_4-2011-12-13-branchpoint~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d984108d931ea74b1435620edb15f087f0c257c2;p=thirdparty%2Fbinutils-gdb.git

fix -Wshadow warning inside ada-lang.c:assign_aggregate

gdb/ChangeLog:

        From Andrey Smirnov <andrew.smirnov@gmail.com>:
        * ada-lang.c (assign_aggregate): Remove declaration of local
        variable `i' which is shadowing another variable with the same
        name declared in the outer scope.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3bb6d51d052..ea8fb66e424 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-23  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	* ada-lang.c (assign_aggregate): Remove declaration of local
+	variable `i' which is shadowing another variable with the same
+	name declared in the outer scope.
+
 2011-11-23  Joel Brobecker  <brobecker@adacore.com>
 
 	* ada-lang.c (get_base_type): Renames base_type.  Adjust all
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 66766850f78..48073fb3d0f 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8665,8 +8665,6 @@ assign_aggregate (struct value *container,
   *pos += 3;
   if (noside != EVAL_NORMAL)
     {
-      int i;
-
       for (i = 0; i < n; i += 1)
 	ada_evaluate_subexp (NULL, exp, pos, noside);
       return container;