skypjack 1 день назад
Родитель
Сommit
06cd683d31

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

@@ -35,7 +35,7 @@ class dense_set_iterator final {
     static_assert(std::is_pointer_v<It>, "Not a pointer type");
 
 public:
-    using value_type = std::remove_const_t<std::remove_pointer_t<It>>::second_type;
+    using value_type = std::remove_const_t<stl::remove_pointer_t<It>>::second_type;
     using pointer = const value_type *;
     using reference = const value_type &;
     using difference_type = std::ptrdiff_t;
@@ -127,7 +127,7 @@ class dense_set_local_iterator final {
     static_assert(std::is_pointer_v<It>, "Not a pointer type");
 
 public:
-    using value_type = std::remove_const_t<std::remove_pointer_t<It>>::second_type;
+    using value_type = std::remove_const_t<stl::remove_pointer_t<It>>::second_type;
     using pointer = const value_type *;
     using reference = const value_type &;
     using difference_type = std::ptrdiff_t;

+ 2 - 2
src/entt/core/type_traits.hpp

@@ -674,7 +674,7 @@ struct has_iterator_category<Type>: std::true_type {};
 
 /*! @copydoc is_iterator */
 template<typename Type>
-requires (!std::is_void_v<std::remove_const_t<std::remove_pointer_t<Type>>>)
+requires (!std::is_void_v<std::remove_const_t<stl::remove_pointer_t<Type>>>)
 struct is_iterator<Type>: internal::has_iterator_category<Type> {};
 
 /**
@@ -844,7 +844,7 @@ class member_class {
 
 public:
     /*! @brief The class of the given non-static member object or function. */
-    using type = std::remove_pointer_t<decltype(clazz(stl::declval<Member>()))>;
+    using type = stl::remove_pointer_t<decltype(clazz(stl::declval<Member>()))>;
 };
 
 /**

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

@@ -41,7 +41,7 @@ const Type *view_placeholder() {
 }
 
 template<typename It>
-[[nodiscard]] bool fully_initialized(It first, const It last, const std::remove_pointer_t<typename stl::iterator_traits<It>::value_type> *placeholder) noexcept {
+[[nodiscard]] bool fully_initialized(It first, const It last, const stl::remove_pointer_t<typename stl::iterator_traits<It>::value_type> *placeholder) noexcept {
     for(; (first != last) && *first != placeholder; ++first) {}
     return first == last;
 }

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

@@ -30,7 +30,7 @@ namespace entt {
 namespace internal {
 
 class basic_meta_factory {
-    using invoke_type = std::remove_pointer_t<decltype(meta_func_node::invoke)>;
+    using invoke_type = stl::remove_pointer_t<decltype(meta_func_node::invoke)>;
 
     enum class mode {
         type,
@@ -370,7 +370,7 @@ public:
                     &meta_setter<Type, Data>,
                     &meta_getter<Type, Data, Policy>});
         } else {
-            using data_type = std::remove_pointer_t<decltype(Data)>;
+            using data_type = stl::remove_pointer_t<decltype(Data)>;
 
             if constexpr(std::is_pointer_v<decltype(Data)>) {
                 static_assert(Policy::template value<decltype(*Data)>, "Invalid return type for the given policy");

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

@@ -200,9 +200,9 @@ class meta_any {
                     if(const auto &elem = any_cast<const Type &>(value.storage); elem) {
                         return (value.storage.policy() == any_policy::cref) ? static_cast<meta_any *>(other)->emplace<decltype(*elem)>(*elem) : static_cast<meta_any *>(other)->emplace<decltype(*const_cast<Type &>(elem))>(*const_cast<Type &>(elem));
                     }
-                } else if constexpr(!std::is_array_v<Type> && !std::is_void_v<std::remove_const_t<std::remove_pointer_t<Type>>>) {
+                } else if constexpr(!std::is_array_v<Type> && !std::is_void_v<std::remove_const_t<stl::remove_pointer_t<Type>>>) {
                     if(auto *pointer = any_cast<Type>(value.storage); pointer) {
-                        static_cast<meta_any *>(other)->emplace<std::conditional_t<std::is_function_v<std::remove_const_t<std::remove_pointer_t<Type>>>, Type, std::remove_pointer_t<Type> &>>(*pointer);
+                        static_cast<meta_any *>(other)->emplace<std::conditional_t<std::is_function_v<std::remove_const_t<stl::remove_pointer_t<Type>>>, Type, stl::remove_pointer_t<Type> &>>(*pointer);
                     }
                 }
             }

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

@@ -158,7 +158,7 @@ template<typename Type, typename Value>
     return static_cast<Type::value_type *>(nullptr);
 }
 
-[[nodiscard]] inline auto *find_overload(meta_func_node *curr, std::remove_pointer_t<decltype(meta_func_node::invoke)> *const ref) {
+[[nodiscard]] inline auto *find_overload(meta_func_node *curr, stl::remove_pointer_t<decltype(meta_func_node::invoke)> *const ref) {
     while((curr != nullptr) && (curr->invoke != ref)) { curr = curr->next.get(); }
     return curr;
 }
@@ -226,7 +226,7 @@ auto setup_node_for() noexcept {
             | (is_complete_v<meta_sequence_container_traits<Type>> ? meta_traits::is_sequence_container : meta_traits::is_none)
             | (is_complete_v<meta_associative_container_traits<Type>> ? meta_traits::is_associative_container : meta_traits::is_none),
         size_of_v<Type>,
-        &resolve<std::remove_const_t<std::remove_pointer_t<Type>>>};
+        &resolve<std::remove_const_t<stl::remove_pointer_t<Type>>>};
 
     if constexpr(std::is_default_constructible_v<Type>) {
         node.default_constructor = +[](const meta_ctx &ctx) {

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

@@ -275,7 +275,7 @@ template<typename Type>
  */
 template<typename Type, auto Data>
 [[nodiscard]] bool meta_setter([[maybe_unused]] meta_handle instance, [[maybe_unused]] meta_any value) {
-    if constexpr(std::is_member_function_pointer_v<decltype(Data)> || std::is_function_v<std::remove_reference_t<std::remove_pointer_t<decltype(Data)>>>) {
+    if constexpr(std::is_member_function_pointer_v<decltype(Data)> || std::is_function_v<std::remove_reference_t<stl::remove_pointer_t<decltype(Data)>>>) {
         using descriptor = meta_function_helper_t<Type, decltype(Data)>;
         using data_type = type_list_element_t<descriptor::is_static, typename descriptor::args_type>;
 
@@ -316,7 +316,7 @@ template<typename Type, auto Data>
  */
 template<typename Type, auto Data, meta_policy Policy = as_value_t>
 [[nodiscard]] meta_any meta_getter(meta_handle instance) {
-    if constexpr(std::is_member_pointer_v<decltype(Data)> || std::is_function_v<std::remove_reference_t<std::remove_pointer_t<decltype(Data)>>>) {
+    if constexpr(std::is_member_pointer_v<decltype(Data)> || std::is_function_v<std::remove_reference_t<stl::remove_pointer_t<decltype(Data)>>>) {
         if constexpr(!std::is_array_v<stl::remove_cvref_t<std::invoke_result_t<decltype(Data), Type &>>>) {
             if constexpr(std::is_invocable_v<decltype(Data), Type &>) {
                 if(auto *clazz = instance->try_cast<Type>(); clazz) {
@@ -333,7 +333,7 @@ template<typename Type, auto Data, meta_policy Policy = as_value_t>
 
         return meta_any{meta_ctx_arg, instance->context()};
     } else if constexpr(std::is_pointer_v<decltype(Data)>) {
-        if constexpr(std::is_array_v<std::remove_pointer_t<decltype(Data)>>) {
+        if constexpr(std::is_array_v<stl::remove_pointer_t<decltype(Data)>>) {
             return meta_any{meta_ctx_arg, instance->context()};
         } else {
             return meta_dispatch<Policy>(instance->context(), *Data);

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

@@ -143,7 +143,7 @@ struct poly_base {
     [[nodiscard]] decltype(auto) invoke(const poly_base &self, Args &&...args) const {
         const auto &poly = static_cast<const Poly &>(self);
 
-        if constexpr(std::is_function_v<std::remove_pointer_t<decltype(poly.vtable)>>) {
+        if constexpr(std::is_function_v<stl::remove_pointer_t<decltype(poly.vtable)>>) {
             return poly.vtable(poly.storage, stl::forward<Args>(args)...);
         } else {
             return std::get<Member>(*poly.vtable)(poly.storage, stl::forward<Args>(args)...);
@@ -155,7 +155,7 @@ struct poly_base {
     [[nodiscard]] decltype(auto) invoke(poly_base &self, Args &&...args) {
         auto &poly = static_cast<Poly &>(self);
 
-        if constexpr(std::is_function_v<std::remove_pointer_t<decltype(poly.vtable)>>) {
+        if constexpr(std::is_function_v<stl::remove_pointer_t<decltype(poly.vtable)>>) {
             static_assert(Member == 0u, "Unknown member");
             return poly.vtable(poly.storage, stl::forward<Args>(args)...);
         } else {

+ 2 - 2
src/entt/signal/delegate.hpp

@@ -291,7 +291,7 @@ private:
  * @tparam Candidate Function or member to connect to the delegate.
  */
 template<auto Candidate>
-delegate(connect_arg_t<Candidate>) -> delegate<std::remove_pointer_t<internal::function_pointer_t<decltype(Candidate)>>>;
+delegate(connect_arg_t<Candidate>) -> delegate<stl::remove_pointer_t<internal::function_pointer_t<decltype(Candidate)>>>;
 
 /**
  * @brief Deduction guide.
@@ -299,7 +299,7 @@ delegate(connect_arg_t<Candidate>) -> delegate<std::remove_pointer_t<internal::f
  * @tparam Type Type of class or type of payload.
  */
 template<auto Candidate, typename Type>
-delegate(connect_arg_t<Candidate>, Type &&) -> delegate<std::remove_pointer_t<internal::function_pointer_t<decltype(Candidate), Type>>>;
+delegate(connect_arg_t<Candidate>, Type &&) -> delegate<stl::remove_pointer_t<internal::function_pointer_t<decltype(Candidate), Type>>>;
 
 /**
  * @brief Deduction guide.

+ 1 - 0
src/entt/stl/type_traits.hpp

@@ -10,6 +10,7 @@ using std::is_invocable_r_v;
 using std::is_member_object_pointer_v;
 using std::is_same_v;
 using std::remove_cvref_t;
+using std::remove_pointer_t;
 
 } // namespace entt::stl
 /*! @endcond */