From b3168e9da370d45ebe57989d9ef2774b7e791c13 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 26 Sep 2006 21:53:18 +0000 Subject: gcc 4.1.0 portability fixes. --- gold/layout.h | 3 +-- gold/stringpool.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'gold') diff --git a/gold/layout.h b/gold/layout.h index 527d2da..89ad8c4 100644 --- a/gold/layout.h +++ b/gold/layout.h @@ -154,8 +154,7 @@ class Layout // Return whether SEG1 comes before SEG2 in the output file. static bool - Layout::segment_precedes(const Output_segment* seg1, - const Output_segment* seg2); + segment_precedes(const Output_segment* seg1, const Output_segment* seg2); // Map from section flags to segment flags. static elfcpp::Elf_Word diff --git a/gold/stringpool.cc b/gold/stringpool.cc index 9a709e0..6437d01 100644 --- a/gold/stringpool.cc +++ b/gold/stringpool.cc @@ -31,7 +31,7 @@ Stringpool::Stringpool_hash::operator()(const char* s) const // Fowler/Noll/Vo (FNV) hash (type FNV-1a). if (sizeof(size_t) == 8) { - size_t result = 14695981039346656037ULL; + size_t result = static_cast(14695981039346656037ULL); while (*s != '\0') { result &= (size_t) *s++; -- cgit v1.1