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/parameters.cc | |
| parent | ab8e2090b6435823d50b29b7a255140ba6ea673f (diff) | |
| download | gdb-2ea97941102380c28117882600265c1187c6fc8b.zip gdb-2ea97941102380c28117882600265c1187c6fc8b.tar.gz 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/parameters.cc')
| -rw-r--r-- | gold/parameters.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gold/parameters.cc b/gold/parameters.cc index cd08c62..2a53998 100644 --- a/gold/parameters.cc +++ b/gold/parameters.cc @@ -1,6 +1,6 @@ // parameters.cc -- general parameters for a link using gold -// Copyright 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +// Copyright 2006, 2007, 2008 Free Software Foundation, Inc. // Written by Ian Lance Taylor <iant@google.com>. // This file is part of gold. @@ -31,50 +31,50 @@ namespace gold { void -Parameters::set_errors(Errors* errs) +Parameters::set_errors(Errors* errors) { gold_assert(this->errors_ == NULL); - this->errors_ = errs; + this->errors_ = errors; } void -Parameters::set_options(const General_options* opts) +Parameters::set_options(const General_options* options) { gold_assert(!this->options_valid()); - this->options_ = opts; + this->options_ = options; // For speed, we convert the options() debug var from a string to an // enum (from debug.h). this->debug_ = debug_string_to_enum(this->options().debug()); // If --verbose is set, it acts as "--debug=files". - if (opts->verbose()) + if (options->verbose()) this->debug_ |= DEBUG_FILES; } void -Parameters::set_doing_static_link(bool doing_staticlink) +Parameters::set_doing_static_link(bool doing_static_link) { gold_assert(!this->doing_static_link_valid_); - this->doing_static_link_ = doing_staticlink; + this->doing_static_link_ = doing_static_link; this->doing_static_link_valid_ = true; } void -Parameters::set_target(Target* targ) +Parameters::set_target(Target* target) { if (!this->target_valid()) - this->target_ = targ; + this->target_ = target; else - gold_assert(targ == this->target_); + gold_assert(target == this->target_); } // Return whether TARGET is compatible with the target we are using. bool -Parameters::is_compatible_target(const Target* targ) const +Parameters::is_compatible_target(const Target* target) const { if (this->target_ == NULL) return true; - return targ == this->target_; + return target == this->target_; } Parameters::Target_size_endianness |