From db4c959472b3a8f82cfb67d2532ba22f44ab98da Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Tue, 30 Sep 2014 16:06:50 -0700 Subject: [PATCH] Fix error from previous patch where tosize and tovalue were redefined in a block, shadowing the declarations outside the block. gold/ PR gold/17432 * resolve.cc (Symbol_table::resolve): Fix local shadowing error. --- gold/ChangeLog | 5 +++++ gold/resolve.cc | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 20f84af51af..f636afa890b 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2014-09-30 Cary Coutant + + PR gold/17432 + * resolve.cc (Symbol_table::resolve): Fix local shadowing error. + 2014-09-30 Kito Cheng PR gold/13597 diff --git a/gold/resolve.cc b/gold/resolve.cc index 52dae8b9994..07dff4ada67 100644 --- a/gold/resolve.cc +++ b/gold/resolve.cc @@ -317,8 +317,8 @@ Symbol_table::resolve(Sized_symbol* to, if (to->is_common() && !is_ordinary && st_shndx == elfcpp::SHN_COMMON) { adjust_common = true; - typename Sized_symbol::Size_type tosize = to->symsize(); - typename Sized_symbol::Value_type tovalue = to->value(); + tosize = to->symsize(); + tovalue = to->value(); } this->override(to, sym, st_shndx, is_ordinary, object, version); if (adjust_common) -- 2.30.2