🐛 Don't assume std::array<>::iterator is a pointer

elbeno · elbeno · commit c9ec853fa307 · 2024-11-21T10:18:26.000-07:00
Problem:
- Container classes define `iterator` as a pointer type but return `begin()` or
  `end()` of the underlying `std::array`, which is an iterator type, not
  necessarily a pointer.

Solution:
- Use `data()` instead of `begin()` where necessary.
diff --git a/include/stdx/cx_map.hpp b/include/stdx/cx_map.hpp
@@ -45,24 +45,24 @@ template <typename Key, typename Value, std::size_t N> class cx_map {
         : storage{vs...}, current_size{sizeof...(Vs)} {}
 
     [[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto
     cbegin() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage);
+        return std::data(storage);
     }
 
     [[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage) + current_size;
+        return cbegin() + current_size;
     }
 
     [[nodiscard]] constexpr auto size() const -> std::size_t {
diff --git a/include/stdx/cx_set.hpp b/include/stdx/cx_set.hpp
@@ -33,24 +33,24 @@ template <typename Key, std::size_t N> class cx_set {
     }
 
     [[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto
     cbegin() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage);
+        return std::data(storage);
     }
 
     [[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage) + current_size;
+        return cbegin() + current_size;
     }
 
     [[nodiscard]] constexpr auto size() const -> size_type {
diff --git a/include/stdx/cx_vector.hpp b/include/stdx/cx_vector.hpp
@@ -40,24 +40,24 @@ template <typename T, std::size_t N> class cx_vector {
     }
 
     [[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage);
+        return std::data(storage);
     }
     [[nodiscard]] constexpr auto
     cbegin() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage);
+        return std::data(storage);
     }
 
     [[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {
-        return std::begin(storage) + current_size;
+        return begin() + current_size;
     }
     [[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {
-        return std::cbegin(storage) + current_size;
+        return cbegin() + current_size;
     }
 
     [[nodiscard]] constexpr auto rbegin() LIFETIMEBOUND -> reverse_iterator {

Original file line number	Diff line number	Diff line change
`@@ -45,24 +45,24 @@ template <typename Key, typename Value, std::size_t N> class cx_map {`
`45`	`45`	`: storage{vs...}, current_size{sizeof...(Vs)} {}`
`46`	`46`
`47`	`47`	`[[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {`
`48`		`- return std::begin(storage);`
	`48`	`+ return std::data(storage);`
`49`	`49`	`}`
`50`	`50`	`[[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {`
`51`		`- return std::begin(storage);`
	`51`	`+ return std::data(storage);`
`52`	`52`	`}`
`53`	`53`	`[[nodiscard]] constexpr auto`
`54`	`54`	`cbegin() const LIFETIMEBOUND -> const_iterator {`
`55`		`- return std::cbegin(storage);`
	`55`	`+ return std::data(storage);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`[[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {`
`59`		`- return std::begin(storage) + current_size;`
	`59`	`+ return begin() + current_size;`
`60`	`60`	`}`
`61`	`61`	`[[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {`
`62`		`- return std::begin(storage) + current_size;`
	`62`	`+ return begin() + current_size;`
`63`	`63`	`}`
`64`	`64`	`[[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {`
`65`		`- return std::cbegin(storage) + current_size;`
	`65`	`+ return cbegin() + current_size;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[[nodiscard]] constexpr auto size() const -> std::size_t {`
Original file line number	Diff line number	Diff line change
`@@ -33,24 +33,24 @@ template <typename Key, std::size_t N> class cx_set {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {`
`36`		`- return std::begin(storage);`
	`36`	`+ return std::data(storage);`
`37`	`37`	`}`
`38`	`38`	`[[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {`
`39`		`- return std::begin(storage);`
	`39`	`+ return std::data(storage);`
`40`	`40`	`}`
`41`	`41`	`[[nodiscard]] constexpr auto`
`42`	`42`	`cbegin() const LIFETIMEBOUND -> const_iterator {`
`43`		`- return std::cbegin(storage);`
	`43`	`+ return std::data(storage);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`[[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {`
`47`		`- return std::begin(storage) + current_size;`
	`47`	`+ return begin() + current_size;`
`48`	`48`	`}`
`49`	`49`	`[[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {`
`50`		`- return std::begin(storage) + current_size;`
	`50`	`+ return begin() + current_size;`
`51`	`51`	`}`
`52`	`52`	`[[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {`
`53`		`- return std::cbegin(storage) + current_size;`
	`53`	`+ return cbegin() + current_size;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[[nodiscard]] constexpr auto size() const -> size_type {`
Original file line number	Diff line number	Diff line change
`@@ -40,24 +40,24 @@ template <typename T, std::size_t N> class cx_vector {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`[[nodiscard]] constexpr auto begin() LIFETIMEBOUND -> iterator {`
`43`		`- return std::begin(storage);`
	`43`	`+ return std::data(storage);`
`44`	`44`	`}`
`45`	`45`	`[[nodiscard]] constexpr auto begin() const LIFETIMEBOUND -> const_iterator {`
`46`		`- return std::begin(storage);`
	`46`	`+ return std::data(storage);`
`47`	`47`	`}`
`48`	`48`	`[[nodiscard]] constexpr auto`
`49`	`49`	`cbegin() const LIFETIMEBOUND -> const_iterator {`
`50`		`- return std::cbegin(storage);`
	`50`	`+ return std::data(storage);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`[[nodiscard]] constexpr auto end() LIFETIMEBOUND -> iterator {`
`54`		`- return std::begin(storage) + current_size;`
	`54`	`+ return begin() + current_size;`
`55`	`55`	`}`
`56`	`56`	`[[nodiscard]] constexpr auto end() const LIFETIMEBOUND -> const_iterator {`
`57`		`- return std::begin(storage) + current_size;`
	`57`	`+ return begin() + current_size;`
`58`	`58`	`}`
`59`	`59`	`[[nodiscard]] constexpr auto cend() const LIFETIMEBOUND -> const_iterator {`
`60`		`- return std::cbegin(storage) + current_size;`
	`60`	`+ return cbegin() + current_size;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`[[nodiscard]] constexpr auto rbegin() LIFETIMEBOUND -> reverse_iterator {`