From e5e61bd728a2088867aaaca57c139965d1b47915 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Sun, 11 Dec 2011 02:27:24 +0000 Subject: [PATCH] * ada-exp.y (write_var_or_type): Rename nested `renaming' to `ren_sym'(-Wshadow). --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.y | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 57d2dfe..4e3edce 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2011-12-10 Andrey Smirnov + + * ada-exp.y (write_var_or_type): Rename nested `renaming' to + `ren_sym'(-Wshadow). + 2011-12-10 Doug Evans * dwarf2read.c (dwarf2_per_cu_data): Rename debug_type_section to diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 9576be5e..bfa3913 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -1287,12 +1287,12 @@ write_var_or_type (struct block *block, struct stoken name0) FIXME pnh 7/20/2007. */ if (nsyms == 1) { - struct symbol *renaming = + struct symbol *ren_sym = ada_find_renaming_symbol (SYMBOL_LINKAGE_NAME (syms[0].sym), syms[0].block); - if (renaming != NULL) - syms[0].sym = renaming; + if (ren_sym != NULL) + syms[0].sym = ren_sym; } type_sym = select_possible_type_sym (syms, nsyms); -- 2.7.4