From: Ian Lance Taylor <ian@airs.com>
Date: Tue, 8 Apr 2008 18:46:43 +0000 (+0000)
Subject: 	* merge.cc (Object_merge_map::get_output_offset): Remove inline
X-Git-Tag: sid-snapshot-20080501~235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=780e49c563bcac5d4dcb4e74ba877ead274d022d;p=platform%2Fupstream%2Fbinutils.git

	* merge.cc (Object_merge_map::get_output_offset): Remove inline
	qualifier.
---

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,