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/fileread.h | |
| 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/fileread.h')
| -rw-r--r-- | gold/fileread.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gold/fileread.h b/gold/fileread.h index 2e27d2f..47c8e0f 100644 --- a/gold/fileread.h +++ b/gold/fileread.h @@ -246,10 +246,10 @@ class File_read DATA_MMAPPED }; - View(off_t vstart, section_size_type vsize, const unsigned char* vdata, - unsigned int vbyteshift, bool cache, Data_ownership data_ownership) - : start_(vstart), size_(vsize), data_(vdata), lock_count_(0), - byteshift_(vbyteshift), cache_(cache), data_ownership_(data_ownership), + View(off_t start, section_size_type size, const unsigned char* data, + unsigned int byteshift, bool cache, Data_ownership data_ownership) + : start_(start), size_(size), data_(data), lock_count_(0), + byteshift_(byteshift), cache_(cache), data_ownership_(data_ownership), accessed_(true) { } @@ -450,8 +450,8 @@ class File_view friend class File_read; // Callers have to get these via File_read::get_lasting_view. - File_view(File_read& file, File_read::View* view, const unsigned char* vdata) - : file_(file), view_(view), data_(vdata) + File_view(File_read& file, File_read::View* view, const unsigned char* data) + : file_(file), view_(view), data_(data) { } File_read& file_; |