From: Cary Coutant <ccoutant@google.com>
Date: Tue, 30 Sep 2014 23:06:50 +0000 (-0700)
Subject: Fix error from previous patch where tosize and tovalue were redefined
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=db4c959472b3a8f82cfb67d2532ba22f44ab98da;p=binutils-gdb.git

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.
---

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  <ccoutant@google.com>
+
+	PR gold/17432
+	* resolve.cc (Symbol_table::resolve): Fix local shadowing error.
+
 2014-09-30  Kito Cheng  <kito@0xlab.org>
 
 	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<size>* to,
 	  if (to->is_common() && !is_ordinary && st_shndx == elfcpp::SHN_COMMON)
 	    {
 	      adjust_common = true;
-	      typename Sized_symbol<size>::Size_type tosize = to->symsize();
-	      typename Sized_symbol<size>::Value_type tovalue = to->value();
+	      tosize = to->symsize();
+	      tovalue = to->value();
 	    }
 	  this->override(to, sym, st_shndx, is_ordinary, object, version);
 	  if (adjust_common)