diff options
| author | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2009-12-14 19:53:05 +0000 |
| commit | 2ea97941102380c28117882600265c1187c6fc8b (patch) | |
| tree | 8f423876f9f118fbe6f7959e60984cd13ad7430d /gold/layout.h | |
| parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
| download | binutils-2ea97941102380c28117882600265c1187c6fc8b.zip binutils-2ea97941102380c28117882600265c1187c6fc8b.tar.gz binutils-2ea97941102380c28117882600265c1187c6fc8b.tar.bz2 | |
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/layout.h')
| -rw-r--r-- | gold/layout.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gold/layout.h b/gold/layout.h index 79785bf..71afa96 100644 --- a/gold/layout.h +++ b/gold/layout.h @@ -151,10 +151,10 @@ class Kept_section // Set the object. void - set_object(Relobj* obj) + set_object(Relobj* object) { gold_assert(this->object_ == NULL); - this->object_ = obj; + this->object_ = object; } // The section index. @@ -164,10 +164,10 @@ class Kept_section // Set the section index. void - set_shndx(unsigned int sec_shndx) + set_shndx(unsigned int shndx) { gold_assert(this->shndx_ == 0); - this->shndx_ = sec_shndx; + this->shndx_ = shndx; } // Whether this is a comdat group. @@ -198,11 +198,11 @@ class Kept_section // Add a section to the group list. void - add_comdat_section(const std::string& name, unsigned int sec_shndx, + add_comdat_section(const std::string& name, unsigned int shndx, uint64_t size) { gold_assert(this->is_comdat_); - Comdat_section_info sinfo(sec_shndx, size); + Comdat_section_info sinfo(shndx, size); this->u_.group_sections->insert(std::make_pair(name, sinfo)); } |