gcc 4.1.0 portability fixes.

This commit is contained in:
Ian Lance Taylor 2006-09-26 21:53:18 +00:00
parent 274e99f9ae
commit b3168e9da3
2 changed files with 2 additions and 3 deletions

View file

@ -154,8 +154,7 @@ class Layout
// Return whether SEG1 comes before SEG2 in the output file. // Return whether SEG1 comes before SEG2 in the output file.
static bool static bool
Layout::segment_precedes(const Output_segment* seg1, segment_precedes(const Output_segment* seg1, const Output_segment* seg2);
const Output_segment* seg2);
// Map from section flags to segment flags. // Map from section flags to segment flags.
static elfcpp::Elf_Word static elfcpp::Elf_Word

View file

@ -31,7 +31,7 @@ Stringpool::Stringpool_hash::operator()(const char* s) const
// Fowler/Noll/Vo (FNV) hash (type FNV-1a). // Fowler/Noll/Vo (FNV) hash (type FNV-1a).
if (sizeof(size_t) == 8) if (sizeof(size_t) == 8)
{ {
size_t result = 14695981039346656037ULL; size_t result = static_cast<size_t>(14695981039346656037ULL);
while (*s != '\0') while (*s != '\0')
{ {
result &= (size_t) *s++; result &= (size_t) *s++;