stl: more on iterator

src/entt/container/dense_map.hpp

@@ -7,7 +7,6 @@
 #include <concepts>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <type_traits>

src/entt/container/dense_set.hpp

@@ -7,7 +7,6 @@
 #include <concepts>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <limits>
 #include <memory>
 #include <type_traits>
@@ -440,7 +439,7 @@ public:
      * @return An iterator to the first instance of the reversed internal array.
      */
     [[nodiscard]] const_reverse_iterator crbegin() const noexcept {
-        return std::make_reverse_iterator(cend());
+        return stl::make_reverse_iterator(cend());
     }
 
     /*! @copydoc crbegin */
@@ -450,7 +449,7 @@ public:
 
     /*! @copydoc rbegin */
     [[nodiscard]] reverse_iterator rbegin() noexcept {
-        return std::make_reverse_iterator(end());
+        return stl::make_reverse_iterator(end());
     }
 
     /**
@@ -459,7 +458,7 @@ public:
      * reversed internal array.
      */
     [[nodiscard]] const_reverse_iterator crend() const noexcept {
-        return std::make_reverse_iterator(cbegin());
+        return stl::make_reverse_iterator(cbegin());
     }
 
     /*! @copydoc crend */
@@ -469,7 +468,7 @@ public:
 
     /*! @copydoc rend */
     [[nodiscard]] reverse_iterator rend() noexcept {
-        return std::make_reverse_iterator(begin());
+        return stl::make_reverse_iterator(begin());
     }
 
     /**

src/entt/container/table.hpp

@@ -3,10 +3,10 @@
 
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <utility>
 #include "../config/config.h"
 #include "../core/iterator.hpp"
+#include "../stl/iterator.hpp"
 #include "../stl/tuple.hpp"
 #include "fwd.hpp"
 

src/entt/core/algorithm.hpp

@@ -4,7 +4,6 @@
 #include <algorithm>
 #include <concepts>
 #include <functional>
-#include <iterator>
 #include <utility>
 #include "../stl/functional.hpp"
 #include "../stl/iterator.hpp"

src/entt/core/iterator.hpp

@@ -2,7 +2,6 @@
 #define ENTT_CORE_ITERATOR_HPP
 
 #include <concepts>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>

src/entt/core/type_traits.hpp

@@ -3,10 +3,10 @@
 
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"
+#include "../stl/iterator.hpp"
 #include "../stl/tuple.hpp"
 #include "fwd.hpp"
 

src/entt/entity/group.hpp

@@ -4,7 +4,6 @@
 #include <array>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"

src/entt/entity/handle.hpp

@@ -1,12 +1,12 @@
 #ifndef ENTT_ENTITY_HANDLE_HPP
 #define ENTT_ENTITY_HANDLE_HPP
 
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"
 #include "../core/iterator.hpp"
 #include "../core/type_traits.hpp"
+#include "../stl/iterator.hpp"
 #include "../stl/tuple.hpp"
 #include "entity.hpp"
 #include "fwd.hpp"

src/entt/entity/registry.hpp

@@ -7,7 +7,6 @@
 #include <concepts>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>

src/entt/entity/runtime_view.hpp

@@ -3,8 +3,8 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <iterator>
 #include <utility>
+#include "../stl/iterator.hpp"
 #include "../stl/vector.hpp"
 #include "entity.hpp"
 #include "fwd.hpp"

src/entt/entity/snapshot.hpp

@@ -3,7 +3,6 @@
 
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"

src/entt/entity/sparse_set.hpp

@@ -4,7 +4,6 @@
 #include <compare>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>
@@ -651,7 +650,7 @@ public:
      * array.
      */
     [[nodiscard]] reverse_iterator rbegin() const noexcept {
-        return std::make_reverse_iterator(end());
+        return stl::make_reverse_iterator(end());
     }
 
     /*! @copydoc rbegin */
@@ -665,7 +664,7 @@ public:
      * reversed sparse set.
      */
     [[nodiscard]] reverse_iterator rend() const noexcept {
-        return std::make_reverse_iterator(begin());
+        return stl::make_reverse_iterator(begin());
     }
 
     /*! @copydoc rend */

src/entt/entity/storage.hpp

@@ -4,7 +4,6 @@
 #include <compare>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>
@@ -589,7 +588,7 @@ public:
      * @return An iterator to the first instance of the reversed internal array.
      */
     [[nodiscard]] const_reverse_iterator crbegin() const noexcept {
-        return std::make_reverse_iterator(cend());
+        return stl::make_reverse_iterator(cend());
     }
 
     /*! @copydoc crbegin */
@@ -599,7 +598,7 @@ public:
 
     /*! @copydoc rbegin */
     [[nodiscard]] reverse_iterator rbegin() noexcept {
-        return std::make_reverse_iterator(end());
+        return stl::make_reverse_iterator(end());
     }
 
     /**
@@ -608,7 +607,7 @@ public:
      * reversed internal array.
      */
     [[nodiscard]] const_reverse_iterator crend() const noexcept {
-        return std::make_reverse_iterator(cbegin());
+        return stl::make_reverse_iterator(cbegin());
     }
 
     /*! @copydoc crend */
@@ -618,7 +617,7 @@ public:
 
     /*! @copydoc rend */
     [[nodiscard]] reverse_iterator rend() noexcept {
-        return std::make_reverse_iterator(begin());
+        return stl::make_reverse_iterator(begin());
     }
 
     /**

src/entt/entity/view.hpp

@@ -4,13 +4,13 @@
 #include <array>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"
 #include "../core/concepts.hpp"
 #include "../core/iterator.hpp"
 #include "../core/type_traits.hpp"
+#include "../stl/iterator.hpp"
 #include "../stl/tuple.hpp"
 #include "entity.hpp"
 #include "fwd.hpp"

src/entt/graph/adjacency_matrix.hpp

@@ -3,12 +3,12 @@
 
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>
 #include "../config/config.h"
 #include "../core/iterator.hpp"
+#include "../stl/iterator.hpp"
 #include "../stl/vector.hpp"
 #include "fwd.hpp"
 

src/entt/graph/flow.hpp

@@ -5,7 +5,6 @@
 #include <concepts>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>

src/entt/meta/container.hpp

@@ -5,7 +5,6 @@
 
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <type_traits>
 #include <utility>
 #include "../core/concepts.hpp"

src/entt/meta/meta.hpp

@@ -4,7 +4,6 @@
 #include <array>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <memory>
 #include <string_view>
 #include <type_traits>

src/entt/meta/range.hpp

@@ -4,7 +4,6 @@
 #include <compare>
 #include <concepts>
 #include <cstddef>
-#include <iterator>
 #include <utility>
 #include "../core/fwd.hpp"
 #include "../core/iterator.hpp"

src/entt/resource/cache.hpp

@@ -5,7 +5,6 @@
 #include <concepts>
 #include <cstddef>
 #include <functional>
-#include <iterator>
 #include <memory>
 #include <type_traits>
 #include <utility>
@@ -14,6 +13,7 @@
 #include "../core/fwd.hpp"
 #include "../core/iterator.hpp"
 #include "../stl/functional.hpp"
+#include "../stl/iterator.hpp"
 #include "../stl/tuple.hpp"
 #include "fwd.hpp"
 #include "loader.hpp"

src/entt/stl/iterator.hpp

@@ -1,18 +1,20 @@
 #ifndef ENTT_STL_ITERATOR_HPP
 #define ENTT_STL_ITERATOR_HPP
 
+#include <iterator>
 #include "../config/config.h"
 
 /*! @cond ENTT_INTERNAL */
+namespace entt::stl {
+
+using std::make_reverse_iterator;
+
 #ifndef ENTT_FORCE_STL
 #    if __has_include(<version>)
 #        include <version>
 #
 #        if defined(__cpp_lib_ranges)
 #            define ENTT_HAS_ITERATOR_CONCEPTS
-#            include <iterator>
-
-namespace entt::stl {
 
 using std::bidirectional_iterator;
 using std::forward_iterator;
@@ -22,19 +24,14 @@ using std::output_iterator;
 using std::random_access_iterator;
 using std::sentinel_for;
 
-} // namespace entt::stl
-
 #        endif
 #    endif
 #endif
 
 #ifndef ENTT_HAS_ITERATOR_CONCEPTS
 #    include <concepts>
-#    include <iterator>
 #    include <utility>
 
-namespace entt::stl {
-
 namespace internal {
 
 template<typename It>
@@ -94,9 +91,9 @@ concept sentinel_for = input_or_output_iterator<It> && requires(Sentinel sentine
     { it == sentinel } -> std::same_as<bool>;
 };
 
-} // namespace entt::stl
-
 #endif
+
+} // namespace entt::stl
 /*! @endcond */
 
 #endif