skypjack 3 дней назад
Родитель
Сommit
be840ee569

+ 4 - 4
src/entt/container/dense_map.hpp

@@ -69,8 +69,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::random_access_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::random_access_iterator_tag;
 
     constexpr dense_map_iterator() noexcept
         : it{} {}
@@ -164,8 +164,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr dense_map_local_iterator() noexcept = default;
 

+ 2 - 2
src/entt/container/dense_set.hpp

@@ -39,7 +39,7 @@ public:
     using pointer = const value_type *;
     using reference = const value_type &;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::random_access_iterator_tag;
+    using iterator_category = stl::random_access_iterator_tag;
 
     constexpr dense_set_iterator() noexcept
         : it{} {}
@@ -131,7 +131,7 @@ public:
     using pointer = const value_type *;
     using reference = const value_type &;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::forward_iterator_tag;
+    using iterator_category = stl::forward_iterator_tag;
 
     constexpr dense_set_local_iterator() noexcept = default;
 

+ 2 - 2
src/entt/container/table.hpp

@@ -25,8 +25,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::random_access_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::random_access_iterator_tag;
 
     constexpr table_iterator() noexcept
         : it{} {}

+ 1 - 1
src/entt/core/iterator.hpp

@@ -64,7 +64,7 @@ struct iota_iterator final {
     /*! @brief Difference type. */
     using difference_type = std::ptrdiff_t;
     /*! @brief Iterator category. */
-    using iterator_category = std::input_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
 
     /*! @brief Default constructor. */
     constexpr iota_iterator() noexcept

+ 2 - 2
src/entt/entity/group.hpp

@@ -42,8 +42,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr extended_group_iterator()
         : it{},

+ 2 - 2
src/entt/entity/handle.hpp

@@ -29,8 +29,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr handle_storage_iterator() noexcept
         : entt{null},

+ 2 - 2
src/entt/entity/registry.hpp

@@ -48,8 +48,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::random_access_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::random_access_iterator_tag;
 
     constexpr registry_storage_iterator() noexcept
         : it{} {}

+ 1 - 1
src/entt/entity/runtime_view.hpp

@@ -30,7 +30,7 @@ public:
     using pointer = iterator_traits::pointer;
     using reference = iterator_traits::reference;
     using difference_type = iterator_traits::difference_type;
-    using iterator_category = std::bidirectional_iterator_tag;
+    using iterator_category = stl::bidirectional_iterator_tag;
 
     constexpr runtime_view_iterator() noexcept
         : pools{},

+ 1 - 1
src/entt/entity/sparse_set.hpp

@@ -28,7 +28,7 @@ struct sparse_set_iterator final {
     using pointer = Container::const_pointer;
     using reference = Container::const_reference;
     using difference_type = Container::difference_type;
-    using iterator_category = std::random_access_iterator_tag;
+    using iterator_category = stl::random_access_iterator_tag;
 
     constexpr sparse_set_iterator() noexcept
         : packed{},

+ 3 - 3
src/entt/entity/storage.hpp

@@ -44,7 +44,7 @@ public:
     using pointer = iterator_traits::pointer;
     using reference = iterator_traits::reference;
     using difference_type = iterator_traits::difference_type;
-    using iterator_category = std::random_access_iterator_tag;
+    using iterator_category = stl::random_access_iterator_tag;
 
     constexpr storage_iterator() noexcept = default;
 
@@ -143,8 +143,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr extended_storage_iterator()
         : it{} {}

+ 3 - 3
src/entt/entity/view.hpp

@@ -80,7 +80,7 @@ public:
     using pointer = iterator_traits::pointer;
     using reference = iterator_traits::reference;
     using difference_type = iterator_traits::difference_type;
-    using iterator_category = std::forward_iterator_tag;
+    using iterator_category = stl::forward_iterator_tag;
 
     constexpr view_iterator() noexcept
         : it{},
@@ -135,8 +135,8 @@ struct extended_view_iterator final {
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr extended_view_iterator()
         : it{} {}

+ 2 - 2
src/entt/graph/adjacency_matrix.hpp

@@ -30,8 +30,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     constexpr edge_iterator() noexcept = default;
 

+ 4 - 4
src/entt/meta/meta.hpp

@@ -1628,8 +1628,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::bidirectional_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::bidirectional_iterator_tag;
 
     meta_iterator() = default;
 
@@ -1709,8 +1709,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::forward_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::forward_iterator_tag;
 
     meta_iterator() = default;
 

+ 2 - 2
src/entt/meta/range.hpp

@@ -23,8 +23,8 @@ struct meta_range_iterator final {
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::random_access_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::random_access_iterator_tag;
 
     constexpr meta_range_iterator() noexcept
         : it{},

+ 2 - 2
src/entt/resource/cache.hpp

@@ -34,8 +34,8 @@ public:
     using pointer = input_iterator_pointer<value_type>;
     using reference = value_type;
     using difference_type = std::ptrdiff_t;
-    using iterator_category = std::input_iterator_tag;
-    using iterator_concept = std::random_access_iterator_tag;
+    using iterator_category = stl::input_iterator_tag;
+    using iterator_concept = stl::random_access_iterator_tag;
 
     constexpr resource_cache_iterator() noexcept = default;
 

+ 4 - 0
src/entt/stl/iterator.hpp

@@ -7,7 +7,11 @@
 /*! @cond ENTT_INTERNAL */
 namespace entt::stl {
 
+using std::bidirectional_iterator_tag;
+using std::forward_iterator_tag;
+using std::input_iterator_tag;
 using std::make_reverse_iterator;
+using std::random_access_iterator_tag;
 
 #ifndef ENTT_FORCE_STL
 #    if __has_include(<version>)