skypjack 1 месяц назад
Родитель
Сommit
b49fb37f34
3 измененных файлов с 6 добавлено и 6 удалено
  1. 3 3
      src/entt/entity/view.hpp
  2. 1 1
      src/entt/meta/factory.hpp
  3. 2 2
      src/entt/meta/utility.hpp

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

@@ -272,7 +272,7 @@ protected:
         current = (current != Get) ? pos : Get;
         current = (current != Get) ? pos : Get;
     }
     }
 
 
-    [[nodiscard]] std::size_t index() const noexcept {
+    [[nodiscard]] stl::size_t index() const noexcept {
         return current;
         return current;
     }
     }
     /*! @endcond */
     /*! @endcond */
@@ -625,8 +625,8 @@ public:
     template<typename Func>
     template<typename Func>
     void each(Func func) const {
     void each(Func func) const {
         constexpr auto fallback = []<auto... Index>(stl::index_sequence<Index...>) {
         constexpr auto fallback = []<auto... Index>(stl::index_sequence<Index...>) {
-            return std::array{&basic_view<get_t<Get...>, exclude_t<Exclude...>>::template each<Func, Index, Index...>...};
-        }(std::index_sequence_for<Get...>{});
+            return stl::array{&basic_view<get_t<Get...>, exclude_t<Exclude...>>::template each<Func, Index, Index...>...};
+        }(stl::index_sequence_for<Get...>{});
 
 
         if(const auto idx = this->index(); idx != sizeof...(Get)) {
         if(const auto idx = this->index(); idx != sizeof...(Get)) {
             (this->*fallback[idx])(stl::move(func));
             (this->*fallback[idx])(stl::move(func));

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

@@ -32,7 +32,7 @@ namespace internal {
 class basic_meta_factory {
 class basic_meta_factory {
     using invoke_type = stl::remove_pointer_t<decltype(meta_func_node::invoke)>;
     using invoke_type = stl::remove_pointer_t<decltype(meta_func_node::invoke)>;
 
 
-    enum class mode : std::uint8_t {
+    enum class mode : stl::uint8_t {
         type,
         type,
         data,
         data,
         func
         func

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

@@ -337,7 +337,7 @@ template<typename Type, auto Candidate>
  */
  */
 template<typename Type, auto Candidate>
 template<typename Type, auto Candidate>
 [[nodiscard]] bool meta_setter(meta_handle instance, meta_any value) {
 [[nodiscard]] bool meta_setter(meta_handle instance, meta_any value) {
-    return meta_setter<Type, Candidate>(std::move(instance), &value);
+    return meta_setter<Type, Candidate>(stl::move(instance), &value);
 }
 }
 
 
 /**
 /**
@@ -384,7 +384,7 @@ template<typename Type, auto Candidate, meta_policy Policy = as_value_t>
  */
  */
 template<typename Type, auto Candidate, meta_policy Policy = as_value_t>
 template<typename Type, auto Candidate, meta_policy Policy = as_value_t>
 [[nodiscard]] meta_any meta_getter(meta_handle instance) {
 [[nodiscard]] meta_any meta_getter(meta_handle instance) {
-    return meta_getter<Type, Candidate, Policy>(std::move(instance), nullptr);
+    return meta_getter<Type, Candidate, Policy>(stl::move(instance), nullptr);
 }
 }
 
 
 /**
 /**