skypjack 4 дней назад
Родитель
Сommit
0d3cecbff1

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

@@ -240,7 +240,7 @@ struct type_list_unique;
 
 
 template<typename First, typename... Other, typename... Type>
 template<typename First, typename... Other, typename... Type>
 struct type_list_unique<type_list<First, Other...>, Type...>
 struct type_list_unique<type_list<First, Other...>, Type...>
-    : std::conditional_t<(stl::is_same_v<First, Type> || ...), type_list_unique<type_list<Other...>, Type...>, type_list_unique<type_list<Other...>, Type..., First>> {};
+    : stl::conditional_t<(stl::is_same_v<First, Type> || ...), type_list_unique<type_list<Other...>, Type...>, type_list_unique<type_list<Other...>, Type..., First>> {};
 
 
 template<typename... Type>
 template<typename... Type>
 struct type_list_unique<type_list<>, Type...> {
 struct type_list_unique<type_list<>, Type...> {
@@ -305,7 +305,7 @@ struct type_list_diff;
 template<typename... Type, typename... Other>
 template<typename... Type, typename... Other>
 struct type_list_diff<type_list<Type...>, type_list<Other...>> {
 struct type_list_diff<type_list<Type...>, type_list<Other...>> {
     /*! @brief A type list that is the difference between the two type lists. */
     /*! @brief A type list that is the difference between the two type lists. */
-    using type = type_list_cat_t<std::conditional_t<type_list_contains_v<type_list<Other...>, Type>, type_list<>, type_list<Type>>...>;
+    using type = type_list_cat_t<stl::conditional_t<type_list_contains_v<type_list<Other...>, Type>, type_list<>, type_list<Type>>...>;
 };
 };
 
 
 /**
 /**
@@ -509,7 +509,7 @@ struct value_list_unique;
 template<auto Value, auto... Other>
 template<auto Value, auto... Other>
 struct value_list_unique<value_list<Value, Other...>> {
 struct value_list_unique<value_list<Value, Other...>> {
     /*! @brief A value list without duplicate types. */
     /*! @brief A value list without duplicate types. */
-    using type = std::conditional_t<
+    using type = stl::conditional_t<
         ((Value == Other) || ...),
         ((Value == Other) || ...),
         typename value_list_unique<value_list<Other...>>::type,
         typename value_list_unique<value_list<Other...>>::type,
         value_list_cat_t<value_list<Value>, typename value_list_unique<value_list<Other...>>::type>>;
         value_list_cat_t<value_list<Value>, typename value_list_unique<value_list<Other...>>::type>>;
@@ -567,7 +567,7 @@ struct value_list_diff;
 template<auto... Value, auto... Other>
 template<auto... Value, auto... Other>
 struct value_list_diff<value_list<Value...>, value_list<Other...>> {
 struct value_list_diff<value_list<Value...>, value_list<Other...>> {
     /*! @brief A value list that is the difference between the two value lists. */
     /*! @brief A value list that is the difference between the two value lists. */
-    using type = value_list_cat_t<std::conditional_t<value_list_contains_v<value_list<Other...>, Value>, value_list<>, value_list<Value>>...>;
+    using type = value_list_cat_t<stl::conditional_t<value_list_contains_v<value_list<Other...>, Value>, value_list<>, value_list<Value>>...>;
 };
 };
 
 
 /**
 /**

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

@@ -570,7 +570,7 @@ public:
     template<typename... Get, typename... Exclude>
     template<typename... Get, typename... Exclude>
     [[nodiscard]] basic_view<get_t<const basic_reactive_mixin, typename basic_registry_type::template storage_for_type<Get>...>, exclude_t<typename basic_registry_type::template storage_for_type<Exclude>...>>
     [[nodiscard]] basic_view<get_t<const basic_reactive_mixin, typename basic_registry_type::template storage_for_type<Get>...>, exclude_t<typename basic_registry_type::template storage_for_type<Exclude>...>>
     view(exclude_t<Exclude...> = exclude_t{}) {
     view(exclude_t<Exclude...> = exclude_t{}) {
-        std::conditional_t<((stl::is_const_v<Get> && ...) && (stl::is_const_v<Exclude> && ...)), const owner_type, owner_type> &parent = owner_or_assert();
+        stl::conditional_t<((stl::is_const_v<Get> && ...) && (stl::is_const_v<Exclude> && ...)), const owner_type, owner_type> &parent = owner_or_assert();
         return {*this, parent.template storage<stl::remove_const_t<Get>>()..., parent.template storage<stl::remove_const_t<Exclude>>()...};
         return {*this, parent.template storage<stl::remove_const_t<Get>>()..., parent.template storage<stl::remove_const_t<Exclude>>()...};
     }
     }
 
 

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

@@ -38,12 +38,12 @@ inline constexpr bool is_group_v = is_group<Type>::value;
 
 
 template<typename Type, typename Override>
 template<typename Type, typename Override>
 struct unpack_type {
 struct unpack_type {
-    using ro = std::conditional_t<
+    using ro = stl::conditional_t<
         type_list_contains_v<Override, const Type> || (stl::is_const_v<Type> && !type_list_contains_v<Override, stl::remove_const_t<Type>>),
         type_list_contains_v<Override, const Type> || (stl::is_const_v<Type> && !type_list_contains_v<Override, stl::remove_const_t<Type>>),
         type_list<stl::remove_const_t<Type>>,
         type_list<stl::remove_const_t<Type>>,
         type_list<>>;
         type_list<>>;
 
 
-    using rw = std::conditional_t<
+    using rw = stl::conditional_t<
         type_list_contains_v<Override, stl::remove_const_t<Type>> || (!stl::is_const_v<Type> && !type_list_contains_v<Override, const Type>),
         type_list_contains_v<Override, stl::remove_const_t<Type>> || (!stl::is_const_v<Type> && !type_list_contains_v<Override, const Type>),
         type_list<Type>,
         type_list<Type>,
         type_list<>>;
         type_list<>>;

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

@@ -34,7 +34,7 @@ class storage_iterator final {
     using container_type = stl::remove_const_t<Container>;
     using container_type = stl::remove_const_t<Container>;
     using alloc_traits = std::allocator_traits<typename container_type::allocator_type>;
     using alloc_traits = std::allocator_traits<typename container_type::allocator_type>;
 
 
-    using iterator_traits = stl::iterator_traits<std::conditional_t<
+    using iterator_traits = stl::iterator_traits<stl::conditional_t<
         stl::is_const_v<Container>,
         stl::is_const_v<Container>,
         typename alloc_traits::template rebind_traits<typename std::pointer_traits<typename container_type::value_type>::element_type>::const_pointer,
         typename alloc_traits::template rebind_traits<typename std::pointer_traits<typename container_type::value_type>::element_type>::const_pointer,
         typename alloc_traits::template rebind_traits<typename std::pointer_traits<typename container_type::value_type>::element_type>::pointer>>;
         typename alloc_traits::template rebind_traits<typename std::pointer_traits<typename container_type::value_type>::element_type>::pointer>>;

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

@@ -693,9 +693,9 @@ public:
     /*! @brief Signed integer type. */
     /*! @brief Signed integer type. */
     using difference_type = std::ptrdiff_t;
     using difference_type = std::ptrdiff_t;
     /*! @brief Random access iterator type. */
     /*! @brief Random access iterator type. */
-    using iterator = std::conditional_t<Policy == deletion_policy::in_place, internal::view_iterator<common_type, true, 1u, 0u>, typename common_type::iterator>;
+    using iterator = stl::conditional_t<Policy == deletion_policy::in_place, internal::view_iterator<common_type, true, 1u, 0u>, typename common_type::iterator>;
     /*! @brief Reverse iterator type. */
     /*! @brief Reverse iterator type. */
-    using reverse_iterator = std::conditional_t<Policy == deletion_policy::in_place, void, typename common_type::reverse_iterator>;
+    using reverse_iterator = stl::conditional_t<Policy == deletion_policy::in_place, void, typename common_type::reverse_iterator>;
 
 
     /**
     /**
      * @brief Returns the leading storage of a view, if any.
      * @brief Returns the leading storage of a view, if any.
@@ -918,7 +918,7 @@ public:
     /*! @brief Reverse iterator type. */
     /*! @brief Reverse iterator type. */
     using reverse_iterator = base_type::reverse_iterator;
     using reverse_iterator = base_type::reverse_iterator;
     /*! @brief Iterable view type. */
     /*! @brief Iterable view type. */
-    using iterable = std::conditional_t<Get::storage_policy == deletion_policy::in_place, iterable_adaptor<internal::extended_view_iterator<iterator, Get>>, decltype(stl::declval<Get>().each())>;
+    using iterable = stl::conditional_t<Get::storage_policy == deletion_policy::in_place, iterable_adaptor<internal::extended_view_iterator<iterator, Get>>, decltype(stl::declval<Get>().each())>;
 
 
     /*! @brief Default constructor to use to create empty, invalid views. */
     /*! @brief Default constructor to use to create empty, invalid views. */
     basic_view() noexcept
     basic_view() noexcept

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

@@ -501,7 +501,7 @@ public:
                 name,
                 name,
                 (descriptor::is_const ? internal::meta_traits::is_const : internal::meta_traits::is_none) | (descriptor::is_static ? internal::meta_traits::is_static : internal::meta_traits::is_none),
                 (descriptor::is_const ? internal::meta_traits::is_const : internal::meta_traits::is_none) | (descriptor::is_static ? internal::meta_traits::is_static : internal::meta_traits::is_none),
                 descriptor::args_type::size,
                 descriptor::args_type::size,
-                &internal::resolve<std::conditional_t<stl::is_same_v<Policy, as_void_t>, void, stl::remove_cvref_t<typename descriptor::return_type>>>,
+                &internal::resolve<stl::conditional_t<stl::is_same_v<Policy, as_void_t>, void, stl::remove_cvref_t<typename descriptor::return_type>>>,
                 &meta_arg<typename descriptor::args_type>,
                 &meta_arg<typename descriptor::args_type>,
                 &meta_invoke<Type, Candidate, Policy>});
                 &meta_invoke<Type, Candidate, Policy>});
 
 

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

@@ -202,13 +202,13 @@ class meta_any {
                     }
                     }
                 } else if constexpr(!stl::is_array_v<Type> && !stl::is_void_v<stl::remove_const_t<stl::remove_pointer_t<Type>>>) {
                 } else if constexpr(!stl::is_array_v<Type> && !stl::is_void_v<stl::remove_const_t<stl::remove_pointer_t<Type>>>) {
                     if(auto *pointer = any_cast<Type>(value.storage); pointer) {
                     if(auto *pointer = any_cast<Type>(value.storage); pointer) {
-                        static_cast<meta_any *>(other)->emplace<std::conditional_t<stl::is_function_v<stl::remove_const_t<stl::remove_pointer_t<Type>>>, Type, stl::remove_pointer_t<Type> &>>(*pointer);
+                        static_cast<meta_any *>(other)->emplace<stl::conditional_t<stl::is_function_v<stl::remove_const_t<stl::remove_pointer_t<Type>>>, Type, stl::remove_pointer_t<Type> &>>(*pointer);
                     }
                     }
                 }
                 }
             }
             }
         } else if constexpr(is_complete_v<meta_sequence_container_traits<Type>> || is_complete_v<meta_associative_container_traits<Type>>) {
         } else if constexpr(is_complete_v<meta_sequence_container_traits<Type>> || is_complete_v<meta_associative_container_traits<Type>>) {
             if(constexpr auto flag = (is_complete_v<meta_sequence_container_traits<Type>> ? internal::meta_traits::is_sequence_container : internal::meta_traits::is_associative_container); req == flag) {
             if(constexpr auto flag = (is_complete_v<meta_sequence_container_traits<Type>> ? internal::meta_traits::is_sequence_container : internal::meta_traits::is_associative_container); req == flag) {
-                using container_type = std::conditional_t<is_complete_v<meta_sequence_container_traits<Type>>, meta_sequence_container, meta_associative_container>;
+                using container_type = stl::conditional_t<is_complete_v<meta_sequence_container_traits<Type>>, meta_sequence_container, meta_associative_container>;
                 *static_cast<container_type *>(other) = (value.storage.policy() == any_policy::cref) ? container_type{*value.ctx, any_cast<const Type &>(value.storage)} : container_type{*value.ctx, any_cast<Type &>(const_cast<meta_any &>(value).storage)};
                 *static_cast<container_type *>(other) = (value.storage.policy() == any_policy::cref) ? container_type{*value.ctx, any_cast<const Type &>(value.storage)} : container_type{*value.ctx, any_cast<Type &>(const_cast<meta_any &>(value).storage)};
             }
             }
         }
         }

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

@@ -48,7 +48,7 @@ template<typename Type, typename Ret, typename Class, typename... Args>
 struct meta_function_descriptor<Type, Ret (Class::*)(Args...) const>
 struct meta_function_descriptor<Type, Ret (Class::*)(Args...) const>
     : meta_function_descriptor_traits<
     : meta_function_descriptor_traits<
           Ret,
           Ret,
-          std::conditional_t<std::is_base_of_v<Class, Type>, type_list<Args...>, type_list<const Class &, Args...>>,
+          stl::conditional_t<std::is_base_of_v<Class, Type>, type_list<Args...>, type_list<const Class &, Args...>>,
           !std::is_base_of_v<Class, Type>,
           !std::is_base_of_v<Class, Type>,
           true> {};
           true> {};
 
 
@@ -63,7 +63,7 @@ template<typename Type, typename Ret, typename Class, typename... Args>
 struct meta_function_descriptor<Type, Ret (Class::*)(Args...)>
 struct meta_function_descriptor<Type, Ret (Class::*)(Args...)>
     : meta_function_descriptor_traits<
     : meta_function_descriptor_traits<
           Ret,
           Ret,
-          std::conditional_t<std::is_base_of_v<Class, Type>, type_list<Args...>, type_list<Class &, Args...>>,
+          stl::conditional_t<std::is_base_of_v<Class, Type>, type_list<Args...>, type_list<Class &, Args...>>,
           !std::is_base_of_v<Class, Type>,
           !std::is_base_of_v<Class, Type>,
           false> {};
           false> {};
 
 
@@ -77,7 +77,7 @@ template<typename Type, typename Ret, typename Class>
 struct meta_function_descriptor<Type, Ret Class::*>
 struct meta_function_descriptor<Type, Ret Class::*>
     : meta_function_descriptor_traits<
     : meta_function_descriptor_traits<
           Ret &,
           Ret &,
-          std::conditional_t<std::is_base_of_v<Class, Type>, type_list<>, type_list<Class &>>,
+          stl::conditional_t<std::is_base_of_v<Class, Type>, type_list<>, type_list<Class &>>,
           !std::is_base_of_v<Class, Type>,
           !std::is_base_of_v<Class, Type>,
           false> {};
           false> {};
 
 
@@ -92,7 +92,7 @@ template<typename Type, typename Ret, typename MaybeType, typename... Args>
 struct meta_function_descriptor<Type, Ret (*)(MaybeType, Args...)>
 struct meta_function_descriptor<Type, Ret (*)(MaybeType, Args...)>
     : meta_function_descriptor_traits<
     : meta_function_descriptor_traits<
           Ret,
           Ret,
-          std::conditional_t<
+          stl::conditional_t<
               stl::is_same_v<stl::remove_cvref_t<MaybeType>, Type> || std::is_base_of_v<stl::remove_cvref_t<MaybeType>, Type>,
               stl::is_same_v<stl::remove_cvref_t<MaybeType>, Type> || std::is_base_of_v<stl::remove_cvref_t<MaybeType>, Type>,
               type_list<Args...>,
               type_list<Args...>,
               type_list<MaybeType, Args...>>,
               type_list<MaybeType, Args...>>,

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

@@ -106,7 +106,7 @@ class poly_vtable {
 
 
 public:
 public:
     /*! @brief Virtual table type. */
     /*! @brief Virtual table type. */
-    using type = std::conditional_t<is_mono, stl::tuple_element_t<0u, vtable_type>, const vtable_type *>;
+    using type = stl::conditional_t<is_mono, stl::tuple_element_t<0u, vtable_type>, const vtable_type *>;
 
 
     /**
     /**
      * @brief Returns a static virtual table for a specific concept and type.
      * @brief Returns a static virtual table for a specific concept and type.

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

@@ -8,6 +8,7 @@ namespace entt::stl {
 
 
 using std::bool_constant;
 using std::bool_constant;
 using std::common_type_t;
 using std::common_type_t;
+using std::conditional_t;
 using std::decay_t;
 using std::decay_t;
 using std::extent_v;
 using std::extent_v;
 using std::false_type;
 using std::false_type;