diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbsupport/safe-iterator.h | 52 |
2 files changed, 53 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 26f764e..368d7f0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-12-12 Tom Tromey <tom@tromey.com> + * gdbsupport/safe-iterator.h (basic_safe_iterator): Simplify. Add + second constructor. + (basic_safe_range): New class. + +2019-12-12 Tom Tromey <tom@tromey.com> + * progspace.c (program_space::multi_objfile_p): New method. * printcmd.c (info_symbol_command): Update. * maint.c (maintenance_translate_address): Update. diff --git a/gdb/gdbsupport/safe-iterator.h b/gdb/gdbsupport/safe-iterator.h index 89aec01..1a98b42 100644 --- a/gdb/gdbsupport/safe-iterator.h +++ b/gdb/gdbsupport/safe-iterator.h @@ -48,17 +48,29 @@ public: typedef typename Iterator::iterator_category iterator_category; typedef typename Iterator::difference_type difference_type; - /* Construct by forwarding all arguments to the underlying - iterator. */ - template<typename... Args> - explicit basic_safe_iterator (Args &&...args) - : m_it (std::forward<Args> (args)...), + /* Construct using the given argument; the end iterator is default + constructed. */ + template<typename Arg> + explicit basic_safe_iterator (Arg &&arg) + : m_it (std::forward<Arg> (arg)), m_next (m_it) { if (m_it != m_end) ++m_next; } + /* Construct the iterator using the first argument, and construct + the end iterator using the second argument. */ + template<typename Arg> + explicit basic_safe_iterator (Arg &&arg, Arg &&arg2) + : m_it (std::forward<Arg> (arg)), + m_next (m_it), + m_end (std::forward<Arg> (arg2)) + { + if (m_it != m_end) + ++m_next; + } + /* Create a one-past-end iterator. */ basic_safe_iterator () {} @@ -90,4 +102,34 @@ private: Iterator m_end {}; }; +/* A range adapter that wraps another range, and then returns safe + iterators wrapping the original range's iterators. */ + +template<typename Range> +class basic_safe_range +{ +public: + + typedef basic_safe_iterator<typename Range::iterator> iterator; + + explicit basic_safe_range (Range range) + : m_range (range) + { + } + + iterator begin () const + { + return iterator (m_range.begin (), m_range.end ()); + } + + iterator end () const + { + return iterator (m_range.end (), m_range.end ()); + } + +private: + + Range m_range; +}; + #endif /* COMMON_SAFE_ITERATOR_H */ |