1
0
skypjack 1 сар өмнө
parent
commit
c53b9c0b30

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

@@ -548,7 +548,7 @@ public:
      * @param first An iterator to the first element of the range of elements.
      * @param last An iterator past the last element of the range of elements.
      */
-    void insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    void insert(stl::input_iterator auto first, stl::input_iterator auto last) {
         for(; first != last; ++first) {
             insert(*first);
         }

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

@@ -525,7 +525,7 @@ public:
      * @param first An iterator to the first element of the range of elements.
      * @param last An iterator past the last element of the range of elements.
      */
-    void insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    void insert(stl::input_iterator auto first, stl::input_iterator auto last) {
         for(; first != last; ++first) {
             insert(*first);
         }

+ 3 - 3
src/entt/core/algorithm.hpp

@@ -34,7 +34,7 @@ struct std_sort {
      * @param args Arguments to forward to the sort function, if any.
      */
     template<typename Compare = std::less<>, typename... Args>
-    void operator()(entt::stl::random_access_iterator auto first, entt::stl::random_access_iterator auto last, Compare compare = Compare{}, Args &&...args) const {
+    void operator()(stl::random_access_iterator auto first, stl::random_access_iterator auto last, Compare compare = Compare{}, Args &&...args) const {
         std::sort(std::forward<Args>(args)..., std::move(first), std::move(last), std::move(compare));
     }
 };
@@ -52,7 +52,7 @@ struct insertion_sort {
      * @param compare A valid comparison function object.
      */
     template<typename Compare = std::less<>>
-    void operator()(entt::stl::random_access_iterator auto first, entt::stl::random_access_iterator auto last, Compare compare = Compare{}) const {
+    void operator()(stl::random_access_iterator auto first, stl::random_access_iterator auto last, Compare compare = Compare{}) const {
         if(first < last) {
             for(auto it = first + 1; it < last; ++it) {
                 auto value = std::move(*it);
@@ -94,7 +94,7 @@ struct radix_sort {
      * @param last An iterator past the last element of the range to sort.
      * @param getter A valid _getter_ function object.
      */
-    template<entt::stl::random_access_iterator It, typename Getter = stl::identity>
+    template<stl::random_access_iterator It, typename Getter = stl::identity>
     void operator()(It first, It last, Getter getter = Getter{}) const {
         if(first < last) {
             constexpr auto passes = N / Bit;

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

@@ -121,7 +121,7 @@ private:
  * @tparam It Type of iterator.
  * @tparam Sentinel Type of sentinel.
  */
-template<entt::stl::input_or_output_iterator It, entt::stl::sentinel_for<It> Sentinel = It>
+template<stl::input_or_output_iterator It, stl::sentinel_for<It> Sentinel = It>
 struct iterable_adaptor final {
     /*! @brief Value type. */
     using value_type = std::iterator_traits<It>::value_type;

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

@@ -643,7 +643,7 @@ public:
      * @param first An iterator to the first element of the range of entities.
      * @param last An iterator past the last element of the range of entities.
      */
-    void sort_as(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) const {
+    void sort_as(stl::input_iterator auto first, stl::input_iterator auto last) const {
         if(*this) {
             descriptor->handle().sort_as(first, last);
         }

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

@@ -363,7 +363,7 @@ public:
      * @param args Parameters to use to forward to the underlying storage.
      */
     template<typename... Args>
-    void insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last, Args &&...args) {
+    void insert(stl::input_iterator auto first, stl::input_iterator auto last, Args &&...args) {
         auto from = underlying_type::size();
         underlying_type::insert(first, last, std::forward<Args>(args)...);
 

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

@@ -541,7 +541,7 @@ public:
      * @param first An iterator to the first element of the range of entities.
      * @param last An iterator past the last element of the range of entities.
      */
-    void destroy(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    void destroy(stl::input_iterator auto first, stl::input_iterator auto last) {
         const auto to = entities.sort_as(first, last);
         const auto from = entities.cend() - static_cast<common_type::difference_type>(entities.free_list());
 
@@ -583,7 +583,7 @@ public:
      * @param last An iterator past the last element of the range of entities.
      */
     template<typename Type>
-    void insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    void insert(stl::input_iterator auto first, stl::input_iterator auto last) {
         ENTT_ASSERT(std::all_of(first, last, [this](const auto entt) { return valid(entt); }), "Invalid entity");
         assure<Type>().insert(std::move(first), std::move(last));
     }
@@ -599,7 +599,7 @@ public:
      * @param value An instance of the element to assign.
      */
     template<typename Type>
-    void insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last, const Type &value) {
+    void insert(stl::input_iterator auto first, stl::input_iterator auto last, const Type &value) {
         ENTT_ASSERT(std::all_of(first, last, [this](const auto entt) { return valid(entt); }), "Invalid entity");
         assure<Type>().insert(std::move(first), std::move(last), value);
     }
@@ -709,7 +709,7 @@ public:
      * @param last An iterator past the last element of the range of entities.
      * @return The number of elements actually removed.
      */
-    template<typename Type, typename... Other, entt::stl::input_iterator It>
+    template<typename Type, typename... Other, stl::input_iterator It>
     size_type remove(It first, It last) {
         size_type count{};
 
@@ -762,7 +762,7 @@ public:
      * @param first An iterator to the first element of the range of entities.
      * @param last An iterator past the last element of the range of entities.
      */
-    template<typename Type, typename... Other, entt::stl::input_iterator It>
+    template<typename Type, typename... Other, stl::input_iterator It>
     void erase(It first, It last) {
         if constexpr(std::is_same_v<It, typename common_type::iterator>) {
             std::array cpools{static_cast<common_type *>(&assure<Type>()), static_cast<common_type *>(&assure<Other>())...};

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

@@ -138,7 +138,7 @@ public:
      * @return An object of this type to continue creating the snapshot.
      */
     template<typename Type, typename Archive>
-    const basic_snapshot &get(Archive &archive, entt::stl::input_iterator auto first, entt::stl::input_iterator auto last, const id_type id = type_hash<Type>::value()) const {
+    const basic_snapshot &get(Archive &archive, stl::input_iterator auto first, stl::input_iterator auto last, const id_type id = type_hash<Type>::value()) const {
         static_assert(!std::is_same_v<Type, entity_type>, "Entity types not supported");
 
         if(const auto *storage = reg->template storage<Type>(id); storage && !storage->empty()) {

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

@@ -792,7 +792,7 @@ public:
      * @return Iterator pointing to the first element inserted in case of
      * success, the `end()` iterator otherwise.
      */
-    iterator push(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    iterator push(stl::input_iterator auto first, stl::input_iterator auto last) {
         auto curr = end();
 
         for(; first != last; ++first) {
@@ -843,7 +843,7 @@ public:
      * @param first An iterator to the first element of the range of entities.
      * @param last An iterator past the last element of the range of entities.
      */
-    template<entt::stl::input_iterator It>
+    template<stl::input_iterator It>
     void erase(It first, It last) {
         if constexpr(std::is_same_v<It, basic_iterator>) {
             pop(first, last);
@@ -870,7 +870,7 @@ public:
      * @param last An iterator past the last element of the range of entities.
      * @return The number of entities actually removed.
      */
-    template<entt::stl::input_iterator It>
+    template<stl::input_iterator It>
     size_type remove(It first, It last) {
         size_type count{};
 
@@ -1029,7 +1029,7 @@ public:
      * @param last An iterator past the last element of the range of entities.
      * @return An iterator past the last of the elements actually shared.
      */
-    template<entt::stl::input_iterator It>
+    template<stl::input_iterator It>
     iterator sort_as(It first, It last) {
         ENTT_ASSERT((mode != deletion_policy::in_place) || (head == max_size), "Sorting with tombstones not allowed");
         const size_type len = (mode == deletion_policy::swap_only) ? head : packed.size();

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

@@ -694,7 +694,7 @@ public:
      * @param value An instance of the object to construct.
      * @return Iterator pointing to the first element inserted, if any.
      */
-    iterator insert(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last, const value_type &value = {}) {
+    iterator insert(stl::input_iterator auto first, stl::input_iterator auto last, const value_type &value = {}) {
         for(; first != last; ++first) {
             emplace_element(*first, true, value);
         }
@@ -902,7 +902,7 @@ public:
      * @param first An iterator to the first element of the range of entities.
      * @param last An iterator past the last element of the range of entities.
      */
-    template<entt::stl::input_iterator It>
+    template<stl::input_iterator It>
     void insert(It first, It last) {
         for(; first != last; ++first) {
             base_type::try_emplace(*first, true);

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

@@ -289,7 +289,7 @@ public:
      * @param last An iterator past the last element of the range of elements.
      * @return This flow builder.
      */
-    basic_flow &ro(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    basic_flow &ro(stl::input_iterator auto first, stl::input_iterator auto last) {
         for(; first != last; ++first) {
             emplace(*first, false);
         }
@@ -313,7 +313,7 @@ public:
      * @param last An iterator past the last element of the range of elements.
      * @return This flow builder.
      */
-    basic_flow &rw(entt::stl::input_iterator auto first, entt::stl::input_iterator auto last) {
+    basic_flow &rw(stl::input_iterator auto first, stl::input_iterator auto last) {
         for(; first != last; ++first) {
             emplace(*first, true);
         }

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

@@ -1618,7 +1618,7 @@ public:
 
     meta_iterator() = default;
 
-    template<entt::stl::bidirectional_iterator It>
+    template<stl::bidirectional_iterator It>
     meta_iterator(const meta_ctx &area, It iter) noexcept
         : ctx{&area},
           vtable{&basic_vtable<It>},
@@ -1699,7 +1699,7 @@ public:
 
     meta_iterator() = default;
 
-    template<bool KeyOnly, entt::stl::forward_iterator It>
+    template<bool KeyOnly, stl::forward_iterator It>
     meta_iterator(const meta_ctx &area, std::bool_constant<KeyOnly>, It iter) noexcept
         : ctx{&area},
           vtable{&basic_vtable<KeyOnly, It>},

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

@@ -112,7 +112,7 @@ private:
  * @tparam Type Type of meta objects returned.
  * @tparam It Type of forward iterator.
  */
-template<typename Type, entt::stl::forward_iterator It>
+template<typename Type, stl::forward_iterator It>
 using meta_range = iterable_adaptor<internal::meta_range_iterator<Type, It>>;
 
 } // namespace entt