diff mbox

[RFA,v2,3/3] Use std::vector in gdb_bfd_data

Message ID 20171020041815.20291-4-tom@tromey.com
State New, archived
Headers

Commit Message

Tom Tromey Oct. 20, 2017, 4:18 a.m. UTC 
  This changes gdb_bfd_data to use std::vector rather than VEC.

ChangeLog
2017-10-19  Tom Tromey  <tom@tromey.com>

	* gdb_bfd.c (~gdb_bfd_data): Use for_each.
	(struct gdb_bfd_data) <included_bfds>: Now a std::vector.
	(gdb_bfd_record_inclusion): Update.
---
 gdb/ChangeLog |  6 ++++++
 gdb/gdb_bfd.c | 17 +++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)
diff mbox

Patch

diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index b60d237635..a706567652 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -33,9 +33,7 @@ 
 #include "target.h"
 #include "gdb/fileio.h"
 #include "inferior.h"
-
-typedef bfd *bfdp;
-DEF_VEC_P (bfdp);
+#include <algorithm>
 
 /* An object of this type is stored in the section's user data when
    mapping a section.  */
@@ -87,14 +85,6 @@  struct gdb_bfd_data
 
   ~gdb_bfd_data ()
   {
-    int ix;
-    bfd *included_bfd;
-
-    for (ix = 0;
-	 VEC_iterate (bfdp, included_bfds, ix, included_bfd);
-	 ++ix)
-      gdb_bfd_unref (included_bfd);
-    VEC_free (bfdp, included_bfds);
   }
 
   /* The reference count.  */
@@ -130,7 +120,7 @@  struct gdb_bfd_data
   bfd *archive_bfd = nullptr;
 
   /* Table of all the bfds this bfd has included.  */
-  VEC (bfdp) *included_bfds = nullptr;
+  std::vector<gdb_bfd_ref_ptr> included_bfds;
 
   /* The registry.  */
   REGISTRY_FIELDS = {};
@@ -875,9 +865,8 @@  gdb_bfd_record_inclusion (bfd *includer, bfd *includee)
 {
   struct gdb_bfd_data *gdata;
 
-  gdb_bfd_ref (includee);
   gdata = (struct gdb_bfd_data *) bfd_usrdata (includer);
-  VEC_safe_push (bfdp, gdata->included_bfds, includee);
+  gdata->included_bfds.push_back (new_bfd_ref (includee));
 }
 
 /* See gdb_bfd.h.  */