Merge pull request #491 from devosoft/mmore500-array-iteratortraits

Add iterator traits to emp::array iterator and fixes conversions to spans for Bits.
devosoft · Dec 1, 2023 · 4e402f3 · 4e402f3
2 parents 8132567 + 6ad7a5d
commit 4e402f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/emp/base/array.hpp b/include/emp/base/array.hpp
@@ -46,6 +46,13 @@ namespace emp {
     using this_t = array_iterator<ITERATOR_T, ARRAY_T>;
     using array_t = ARRAY_T;
 
+    // Iterator traits
+    using iterator_category = typename std::iterator_traits<ITERATOR_T>::iterator_category;
+    using value_type = typename std::iterator_traits<ITERATOR_T>::value_type;
+    using difference_type = typename std::iterator_traits<ITERATOR_T>::difference_type;
+    using pointer = typename std::iterator_traits<ITERATOR_T>::pointer;
+    using reference = typename std::iterator_traits<ITERATOR_T>::reference;
+
     ITERATOR_T it;
     const array_t * arr_ptr { nullptr }; // Which array was iterator created from?
 

diff --git a/include/emp/bits/Bits_Data.hpp b/include/emp/bits/Bits_Data.hpp
@@ -196,8 +196,8 @@ namespace emp {
         }
       }
 
-      [[nodiscard]] auto AsSpan() { return std::span<field_t,MAX_FIELDS>(bits.data()); }
-      [[nodiscard]] auto AsSpan() const { return std::span<const field_t,MAX_FIELDS>(bits.data()); }
+      [[nodiscard]] auto AsSpan() { return std::span<field_t,MAX_FIELDS>(bits.data(), MAX_FIELDS); }
+      [[nodiscard]] auto AsSpan() const { return std::span<const field_t,MAX_FIELDS>(bits.data(), MAX_FIELDS); }
 
       [[nodiscard]] bool OK() const { return true; } // Nothing to check yet.