From 6c8052f6b22fbb6ae1edc759454626d465ee317c Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Sat, 19 Oct 2024 08:10:38 +0200 Subject: [PATCH] [gdbsupport] Use std::span-style iterators for gdb::array_view There's a plan to replace gdb::array_view with std::span (PR31422), and making gdb::array_view more like std::span helps with that. One difference is that std::span has: ... constexpr iterator begin() const noexcept; constexpr const_iterator cbegin() const noexcept; ... while gdb::array_view has: ... constexpr T *begin () noexcept; constexpr const T *begin () const noexcept; ... Fix this by renaming the second variant to cbegin, and making the first variant const. Likewise for gdb::array_view::end. Tested on aarch64-linux. Approved-By: Tom Tromey --- gdbsupport/array-view.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdbsupport/array-view.h b/gdbsupport/array-view.h index 93842a40ec1..0dea26f67ac 100644 --- a/gdbsupport/array-view.h +++ b/gdbsupport/array-view.h @@ -157,11 +157,11 @@ public: constexpr T *data () noexcept { return m_array; } constexpr const T *data () const noexcept { return m_array; } - constexpr T *begin () noexcept { return m_array; } - constexpr const T *begin () const noexcept { return m_array; } + constexpr T *begin () const noexcept { return m_array; } + constexpr const T *cbegin () const noexcept { return m_array; } - constexpr T *end () noexcept { return m_array + m_size; } - constexpr const T *end () const noexcept { return m_array + m_size; } + constexpr T *end () const noexcept { return m_array + m_size; } + constexpr const T *cend () const noexcept { return m_array + m_size; } constexpr reference operator[] (size_t index) noexcept { -- 2.39.5