Remove unused IterConcept from iterator_interface

bemanproject · Feb 8, 2025 · 76932a0 · 76932a0
1 parent 75a090b
commit 76932a0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/include/beman/any_view/detail/iterator.hpp b/include/beman/any_view/detail/iterator.hpp
@@ -33,13 +33,12 @@ class iterator {
     static constexpr bool random_access = std::derived_from<IterConceptT, std::random_access_iterator_tag>;
     static constexpr bool contiguous    = std::derived_from<IterConceptT, std::contiguous_iterator_tag>;
 
-    using interface_type = iterator_interface<IterConceptT, ElementT, RefT, RValueRefT, DiffT>;
+    using interface_type = iterator_interface<ElementT, RefT, RValueRefT, DiffT>;
     // inplace storage sufficient for a vtable pointer and two pointers
     intrusive_small_ptr<interface_type, 3 * sizeof(void*)> iterator_ptr;
 
     template <class IteratorT, class SentinelT>
-    using adaptor_type =
-        detail::iterator_adaptor<IterConceptT, ElementT, reference, rvalue_reference, DiffT, IteratorT, SentinelT>;
+    using adaptor_type = detail::iterator_adaptor<ElementT, reference, rvalue_reference, DiffT, IteratorT, SentinelT>;
 
     template <class IteratorT, class SentinelT>
     static constexpr auto get_noexcept() {

diff --git a/include/beman/any_view/detail/iterator_adaptor.hpp b/include/beman/any_view/detail/iterator_adaptor.hpp
@@ -11,28 +11,27 @@
 
 namespace beman::any_view::detail {
 
-template <class IterConceptT,
-          class ElementT,
+template <class ElementT,
           class RefT,
           class RValueRefT,
           class DiffT,
           std::input_or_output_iterator IteratorT,
           std::sentinel_for<IteratorT>  SentinelT>
-class iterator_adaptor : public iterator_interface<IterConceptT, ElementT, RefT, RValueRefT, DiffT> {
+class iterator_adaptor : public iterator_interface<ElementT, RefT, RValueRefT, DiffT> {
     [[no_unique_address]] IteratorT iterator;
     [[no_unique_address]] SentinelT sentinel;
 
-    using iterator_interface = detail::iterator_interface<IterConceptT, ElementT, RefT, RValueRefT, DiffT>;
+    using iterator_interface = detail::iterator_interface<ElementT, RefT, RValueRefT, DiffT>;
     using pointer            = std::add_pointer_t<RefT>;
 
     static constexpr auto get_noexcept() {
         return std::is_nothrow_move_constructible_v<IteratorT> and std::is_nothrow_move_constructible_v<SentinelT>;
     }
 
-    static constexpr bool forward       = std::derived_from<IterConceptT, std::forward_iterator_tag>;
-    static constexpr bool bidirectional = std::derived_from<IterConceptT, std::bidirectional_iterator_tag>;
-    static constexpr bool random_access = std::derived_from<IterConceptT, std::random_access_iterator_tag>;
-    static constexpr bool contiguous    = std::derived_from<IterConceptT, std::contiguous_iterator_tag>;
+    static constexpr bool forward       = std::forward_iterator<IteratorT>;
+    static constexpr bool bidirectional = std::bidirectional_iterator<IteratorT>;
+    static constexpr bool random_access = std::random_access_iterator<IteratorT>;
+    static constexpr bool contiguous    = std::contiguous_iterator<IteratorT>;
 
     static constexpr auto down_cast(const iterator_interface& other) {
         return dynamic_cast<const iterator_adaptor*>(std::addressof(other));

diff --git a/include/beman/any_view/detail/iterator_interface.hpp b/include/beman/any_view/detail/iterator_interface.hpp
@@ -9,7 +9,7 @@
 
 namespace beman::any_view::detail {
 
-template <class IterConceptT, class ElementT, class RefT, class RValueRefT, class DiffT>
+template <class ElementT, class RefT, class RValueRefT, class DiffT>
 class iterator_interface {
     using pointer = std::add_pointer_t<RefT>;