aboutsummaryrefslogtreecommitdiff
path: root/gold/dynobj.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/dynobj.h
parentab8e2090b6435823d50b29b7a255140ba6ea673f (diff)
downloadfsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.zip
fsf-binutils-gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz
fsf-binutils-gdb-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/dynobj.h')
-rw-r--r--gold/dynobj.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/gold/dynobj.h b/gold/dynobj.h
index be0d975..66d2bff 100644
--- a/gold/dynobj.h
+++ b/gold/dynobj.h
@@ -330,10 +330,10 @@ class Version_base
// Set the version index.
void
- set_index(unsigned int vindex)
+ set_index(unsigned int index)
{
gold_assert(this->index_ == -1U);
- this->index_ = vindex;
+ this->index_ = index;
}
// Clear the weak flag in a version definition.
@@ -354,10 +354,10 @@ class Version_base
class Verdef : public Version_base
{
public:
- Verdef(const char* vname, const std::vector<std::string>& deps,
- bool is_base, bool vis_weak, bool vis_symbol_created)
- : name_(vname), deps_(deps), is_base_(is_base), is_weak_(vis_weak),
- is_symbol_created_(vis_symbol_created)
+ Verdef(const char* name, const std::vector<std::string>& deps,
+ bool is_base, bool is_weak, bool is_symbol_created)
+ : name_(name), deps_(deps), is_base_(is_base), is_weak_(is_weak),
+ is_symbol_created_(is_symbol_created)
{ }
// Return the version name.
@@ -373,8 +373,8 @@ class Verdef : public Version_base
// Add a dependency to this version. The NAME should be
// canonicalized in the dynamic Stringpool.
void
- add_dependency(const char* dname)
- { this->deps_.push_back(dname); }
+ add_dependency(const char* name)
+ { this->deps_.push_back(name); }
// Return whether this definition is weak.
bool
@@ -424,8 +424,8 @@ class Verdef : public Version_base
class Verneed_version : public Version_base
{
public:
- Verneed_version(const char* ver)
- : version_(ver)
+ Verneed_version(const char* version)
+ : version_(version)
{ }
// Return the version name.
@@ -450,8 +450,8 @@ class Verneed_version : public Version_base
class Verneed
{
public:
- Verneed(const char* fname)
- : filename_(fname), need_versions_()
+ Verneed(const char* filename)
+ : filename_(filename), need_versions_()
{ }
~Verneed();