diff options
| author | Ian Lance Taylor <ian@airs.com> | 2008-07-25 04:25:49 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2008-07-25 04:25:49 +0000 |
| commit | cf577e07021ad076f0788fa18c516a667d3d2e0e (patch) | |
| tree | d907d5ce47a9530922b4d4c1b02e70bd777d2e18 /gold/object.h | |
| parent | 2db5b651cc1f68194b9df90f3f9b601aa6e549a0 (diff) | |
| download | binutils-redhat-cf577e07021ad076f0788fa18c516a667d3d2e0e.tar.gz | |
PR 5990
* descriptors.cc: New file.
* descriptors.h: New file.
* gold-threads.h (class Hold_optional_lock): New class.
* fileread.cc: Include "descriptors.h".
(File_read::~File_read): Release descriptor rather than closing
it.
(File_read::open) [file]: Call open_descriptor rather than open.
Set is_descriptor_opened_.
(File_read::open) [memory]: Assert that descriptor is not open.
(File_read::reopen_descriptor): New function.
(File_read::release): Release descriptor.
(File_read::do_read): Make non-const. Reopen descriptor.
(File_read::read): Make non-const.
(File_read::make_view): Reopen descriptor.
(File_read::do_readv): Likewise.
* fileread.h (class File_read): Add is_descriptor_opened_ field.
Update declarations.
* layout.cc: Include "descriptors.h".
(Layout::create_build_id): Use open_descriptor rather than open.
* output.cc: Include "descriptors.h".
(Output_file::open): Use open_descriptor rather than open.
* archive.cc (Archive::const_iterator): Change Archive to be
non-const.
(Archive::begin, Archive::end): Make non-const.
(Archive::count_members): Likewise.
* archive.h (class Archive): Update declarations.
* object.h (Object::read): Make non-const.
* Makefile.am (CCFILES): Add descriptors.cc.
(HFILES): Add descriptors.h.
* Makefile.in: Rebuild.
Diffstat (limited to 'gold/object.h')
| -rw-r--r-- | gold/object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gold/object.h b/gold/object.h index 8ddd68970a..188f1f208f 100644 --- a/gold/object.h +++ b/gold/object.h @@ -410,7 +410,7 @@ class Object // Read data from the underlying file. void - read(off_t start, section_size_type size, void* p) const + read(off_t start, section_size_type size, void* p) { this->input_file()->file().read(start + this->offset_, size, p); } // Read multiple data from the underlying file. |