aboutsummaryrefslogtreecommitdiff
path: root/gdbsupport
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2023-05-10 12:03:13 -0400
committerSimon Marchi <simon.marchi@efficios.com>2023-05-25 08:47:12 -0400
commit774d21c10b971425c758b10ab65e28104feae47c (patch)
treed0aeea91b98950f8adee55556f9971e89a045ccb /gdbsupport
parentf5951b9ff8a018c9234656e9b26b372c6b3d238b (diff)
downloadgdb-774d21c10b971425c758b10ab65e28104feae47c.zip
gdb-774d21c10b971425c758b10ab65e28104feae47c.tar.gz
gdb-774d21c10b971425c758b10ab65e28104feae47c.tar.bz2
gdbsupport: add missing increment/decrement operators to reference_to_pointer_iterator
Using the following patch, I would get this build failure: CXX breakpoint.o In file included from /usr/include/c++/13.1.1/bits/stl_algobase.h:66, from /usr/include/c++/13.1.1/bits/hashtable_policy.h:36, from /usr/include/c++/13.1.1/bits/hashtable.h:35, from /usr/include/c++/13.1.1/bits/unordered_map.h:33, from /usr/include/c++/13.1.1/unordered_map:41, from /usr/include/c++/13.1.1/functional:63, from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/ptid.h:35, from /home/smarchi/src/binutils-gdb/gdb/../gdbsupport/common-defs.h:206, from /home/smarchi/src/binutils-gdb/gdb/defs.h:26, from /home/smarchi/src/binutils-gdb/gdb/breakpoint.c:20: /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h: In instantiation of ‘constexpr void std::__advance(_BidirectionalIterator&, _Distance, bidirectional_iterator_tag) [with _BidirectionalIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; _Distance = long int]’: /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:224:21: required from ‘constexpr void std::advance(_InputIterator&, _Distance) [with _InputIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; _Distance = long int]’ /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:237:19: required from ‘constexpr _InputIterator std::next(_InputIterator, typename iterator_traits<_Iter>::difference_type) [with _InputIterator = reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >; typename iterator_traits<_Iter>::difference_type = long int]’ /home/smarchi/src/binutils-gdb/gdb/breakpoint.c:1073:19: required from here /usr/include/c++/13.1.1/bits/stl_iterator_base_funcs.h:179:11: error: no match for ‘operator--’ (operand type is ‘reference_to_pointer_iterator<intrusive_list_iterator<bp_location, intrusive_base_node<bp_location> > >’) 179 | --__i; | ^~~~~ This points out that while intrusive_list_iterator has an operator--, the reference_to_pointer_iterator wrapper does not. I'm not to sure why the compiler chooses the overload of __advance that accepts a _BidirectionalIterator, given that reference_to_pointer_iterator can't be decremented, but adding those operators seems like the right thing to do in any case, for completeness. Change-Id: I8e2044b6734fadf0f21093047cf35bb7080dbdc3 Reviewed-By: Andrew Burgess <aburgess@redhat.com>
Diffstat (limited to 'gdbsupport')
-rw-r--r--gdbsupport/reference-to-pointer-iterator.h18
1 files changed, 18 insertions, 0 deletions
diff --git a/gdbsupport/reference-to-pointer-iterator.h b/gdbsupport/reference-to-pointer-iterator.h
index 792659b..1579d4d 100644
--- a/gdbsupport/reference-to-pointer-iterator.h
+++ b/gdbsupport/reference-to-pointer-iterator.h
@@ -68,6 +68,24 @@ struct reference_to_pointer_iterator
return *this;
}
+ self_type &operator++ (int)
+ {
+ m_it++;
+ return *this;
+ }
+
+ self_type &operator-- ()
+ {
+ --m_it;
+ return *this;
+ }
+
+ self_type &operator-- (int)
+ {
+ m_it--;
+ return *this;
+ }
+
bool operator== (const self_type &other) const
{ return m_it == other.m_it; }