Use std::vector in objfiles.c

This patch changes a spot in objfiles.c to use a std::vector, removing
a cleanup.

2016-09-23  Tom Tromey  <tom@tromey.com>

	* objfiles.c: Include <vector>.
	(objfile_relocate): Use std::vector.
This commit is contained in:
Tom Tromey
2016-09-22 08:33:13 -06:00
parent ab8b80a885
commit cfe826d45e
2 changed files with 11 additions and 7 deletions

View File

@ -53,6 +53,8 @@
#include "gdb_bfd.h"
#include "btrace.h"
#include <vector>
/* Keep a registry of per-objfile data-pointers required by other GDB
modules. */
@ -943,7 +945,6 @@ objfile_relocate (struct objfile *objfile,
debug_objfile = objfile_separate_debug_iterate (objfile, debug_objfile))
{
struct section_addr_info *objfile_addrs;
struct section_offsets *new_debug_offsets;
struct cleanup *my_cleanups;
objfile_addrs = build_section_addr_info_from_objfile (objfile);
@ -956,15 +957,13 @@ objfile_relocate (struct objfile *objfile,
gdb_assert (debug_objfile->num_sections
== gdb_bfd_count_sections (debug_objfile->obfd));
new_debug_offsets =
((struct section_offsets *)
xmalloc (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections)));
make_cleanup (xfree, new_debug_offsets);
relative_addr_info_to_section_offsets (new_debug_offsets,
std::vector<struct section_offsets>
new_debug_offsets (SIZEOF_N_SECTION_OFFSETS (debug_objfile->num_sections));
relative_addr_info_to_section_offsets (new_debug_offsets.data (),
debug_objfile->num_sections,
objfile_addrs);
changed |= objfile_relocate1 (debug_objfile, new_debug_offsets);
changed |= objfile_relocate1 (debug_objfile, new_debug_offsets.data ());
do_cleanups (my_cleanups);
}