X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fprogspace.h;h=a731eb6e24de73461d14eeddfd9cc4078c0308fa;hb=d0801dd8f22a3e739c6a7d126d45829df981794d;hp=86bc22acc22c61ae0cd7df69debc7065b3282a5b;hpb=deeafabb678e59d8585be6d765c7fbd0e7060b6c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/progspace.h b/gdb/progspace.h index 86bc22acc2..a731eb6e24 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -27,6 +27,7 @@ #include "registry.h" #include "gdbsupport/next-iterator.h" #include "gdbsupport/safe-iterator.h" +#include struct target_ops; struct bfd; @@ -138,20 +139,18 @@ struct program_space program_space (address_space *aspace_); ~program_space (); - typedef next_adapter objfiles_range; + typedef std::list objfiles_range; /* Return an iterable object that can be used to iterate over all objfiles. The basic use is in a foreach, like: for (objfile *objf : pspace->objfiles ()) { ... } */ - objfiles_range objfiles () + objfiles_range &objfiles () { - return objfiles_range (objfiles_head); + return objfiles_list; } - typedef next_adapter>> - objfiles_safe_range; + typedef basic_safe_range objfiles_safe_range; /* An iterable object that can be used to iterate over all objfiles. The basic use is in a foreach, like: @@ -162,7 +161,7 @@ struct program_space deleted during iteration. */ objfiles_safe_range objfiles_safe () { - return objfiles_safe_range (objfiles_head); + return objfiles_safe_range (objfiles_list); } /* Add OBJFILE to the list of objfiles, putting it just before @@ -175,7 +174,10 @@ struct program_space /* Return true if there is more than one object file loaded; false otherwise. */ - bool multi_objfile_p () const; + bool multi_objfile_p () const + { + return objfiles_list.size () > 1; + } /* Pointer to next in linked list. */ @@ -228,9 +230,8 @@ struct program_space (e.g. the argument to the "symbol-file" or "file" command). */ struct objfile *symfile_object_file = NULL; - /* All known objfiles are kept in a linked list. This points to - the head of this list. */ - struct objfile *objfiles_head = NULL; + /* All known objfiles are kept in a linked list. */ + std::list objfiles_list; /* The set of target sections matching the sections mapped into this program space. Managed by both exec_ops and solib.c. */ @@ -271,10 +272,6 @@ struct address_space #define symfile_objfile current_program_space->symfile_object_file -/* All known objfiles are kept in a linked list. This points to the - root of this list. */ -#define object_files current_program_space->objfiles_head - /* The set of target sections matching the sections mapped into the current program space. */ #define current_target_sections (¤t_program_space->target_sections)