Skip to content

Commit

Permalink
* incremental.cc
Browse files Browse the repository at this point in the history
	(Output_section_incremental_inputs::write_input_files): Add cast
	to avoid signed/unsigned comparison warning.
	(Output_section_incremental_inputs::write_info_blocks): Likewise.
  • Loading branch information
ianlancetaylor committed Aug 19, 2010
1 parent 561ff6a commit 56f75c0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
7 changes: 7 additions & 0 deletions gold/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2010-08-18 Ian Lance Taylor <[email protected]>

* incremental.cc
(Output_section_incremental_inputs::write_input_files): Add cast
to avoid signed/unsigned comparison warning.
(Output_section_incremental_inputs::write_info_blocks): Likewise.

2010-08-12 Cary Coutant <[email protected]>

* common.cc (Sort_commons::operator()): Remove unnecessary code.
Expand Down
11 changes: 7 additions & 4 deletions gold/incremental.cc
Original file line number Diff line number Diff line change
Expand Up @@ -784,7 +784,7 @@ Output_section_incremental_inputs<size, big_endian>::write_input_files(
p != inputs->input_files().end();
++p)
{
gold_assert(pov - oview == (*p)->get_offset());
gold_assert(static_cast<unsigned int>(pov - oview) == (*p)->get_offset());
section_offset_type filename_offset =
strtab->get_offset_from_key((*p)->get_filename_key());
const Timespec& mtime = (*p)->get_mtime();
Expand Down Expand Up @@ -827,7 +827,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(
case INCREMENTAL_INPUT_OBJECT:
case INCREMENTAL_INPUT_ARCHIVE_MEMBER:
{
gold_assert(pov - oview == (*p)->get_info_offset());
gold_assert(static_cast<unsigned int>(pov - oview)
== (*p)->get_info_offset());
Incremental_object_entry* entry = (*p)->object_entry();
gold_assert(entry != NULL);
const Object* obj = entry->object();
Expand Down Expand Up @@ -897,7 +898,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(

case INCREMENTAL_INPUT_SHARED_LIBRARY:
{
gold_assert(pov - oview == (*p)->get_info_offset());
gold_assert(static_cast<unsigned int>(pov - oview)
== (*p)->get_info_offset());
Incremental_object_entry* entry = (*p)->object_entry();
gold_assert(entry != NULL);
const Object* obj = entry->object();
Expand All @@ -920,7 +922,8 @@ Output_section_incremental_inputs<size, big_endian>::write_info_blocks(

case INCREMENTAL_INPUT_ARCHIVE:
{
gold_assert(pov - oview == (*p)->get_info_offset());
gold_assert(static_cast<unsigned int>(pov - oview)
== (*p)->get_info_offset());
Incremental_archive_entry* entry = (*p)->archive_entry();
gold_assert(entry != NULL);

Expand Down

0 comments on commit 56f75c0

Please sign in to comment.