summaryrefslogtreecommitdiff
path: root/gold/reloc.h
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2009-12-14 19:53:05 +0000
committerIan Lance Taylor <ian@airs.com>2009-12-14 19:53:05 +0000
commit2ea97941102380c28117882600265c1187c6fc8b (patch)
tree8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/reloc.h
parentab8e2090b6435823d50b29b7a255140ba6ea673f (diff)
downloadbinutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz
Revert -Wshadow changes, all changes from:
2009-12-11 Doug Kwan <dougkwan@google.com> 2009-12-11 Nick Clifton <nickc@redhat.com> * configure.ac: Remove -Wshadow when setting WARN_CXXFLAGS.
Diffstat (limited to 'gold/reloc.h')
-rw-r--r--gold/reloc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gold/reloc.h b/gold/reloc.h
index 30a55ff2da0..5dd4c851533 100644
--- a/gold/reloc.h
+++ b/gold/reloc.h
@@ -259,10 +259,10 @@ class Relocatable_relocs
// Record what to do for the next reloc.
void
- set_next_reloc_strategy(Reloc_strategy astrategy)
+ set_next_reloc_strategy(Reloc_strategy strategy)
{
- this->reloc_strategies_.push_back(static_cast<unsigned char>(astrategy));
- if (astrategy != RELOC_DISCARD)
+ this->reloc_strategies_.push_back(static_cast<unsigned char>(strategy));
+ if (strategy != RELOC_DISCARD)
++this->output_reloc_count_;
}