diff options
| author | Ian Lance Taylor <ian@airs.com> | 2008-04-08 18:46:43 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2008-04-08 18:46:43 +0000 |
| commit | 780e49c563bcac5d4dcb4e74ba877ead274d022d (patch) | |
| tree | 81bea19a6e91f869304cde1de9f2957f84c4c5b8 | |
| parent | 4d8ac24426ed65dfb0c59af49780fb42eff58dc2 (diff) | |
| download | fsf-binutils-gdb-780e49c563bcac5d4dcb4e74ba877ead274d022d.zip fsf-binutils-gdb-780e49c563bcac5d4dcb4e74ba877ead274d022d.tar.gz fsf-binutils-gdb-780e49c563bcac5d4dcb4e74ba877ead274d022d.tar.bz2 | |
* merge.cc (Object_merge_map::get_output_offset): Remove inline
qualifier.
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/merge.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 6eb7f79..6a8ac98 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2008-04-08 Ian Lance Taylor <iant@google.com> + + * merge.cc (Object_merge_map::get_output_offset): Remove inline + qualifier. + 2008-04-08 Craig Silverstein <csilvers@google.com> * configure.ac: Export new conditional variable HAVE_ZLIB. diff --git a/gold/merge.cc b/gold/merge.cc index 9b416e6..1369938 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -140,7 +140,7 @@ Object_merge_map::add_mapping(const Merge_map* merge_map, unsigned int shndx, // Get the output offset for an input address. -inline bool +bool Object_merge_map::get_output_offset(const Merge_map* merge_map, unsigned int shndx, section_offset_type input_offset, |