diff --git a/src/entt/entity/mixin.hpp b/src/entt/entity/mixin.hpp index f551d5759..b36c13918 100644 --- a/src/entt/entity/mixin.hpp +++ b/src/entt/entity/mixin.hpp @@ -65,7 +65,7 @@ class basic_sigh_mixin final: public Type { using sigh_type = sigh; using underlying_iterator = underlying_type::base_type::basic_iterator; - static_assert(std::is_base_of_v, "Invalid registry type"); + static_assert(stl::is_base_of_v, "Invalid registry type"); [[nodiscard]] auto &owner_or_assert() const noexcept { ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); @@ -397,7 +397,7 @@ class basic_reactive_mixin final: public Type { using basic_registry_type = basic_registry; using container_type = stl::vector>; - static_assert(std::is_base_of_v, "Invalid registry type"); + static_assert(stl::is_base_of_v, "Invalid registry type"); [[nodiscard]] auto &owner_or_assert() const noexcept { ENTT_ASSERT(owner != nullptr, "Invalid pointer to registry"); diff --git a/src/entt/meta/policy.hpp b/src/entt/meta/policy.hpp index b3a9f2b11..b72464da9 100644 --- a/src/entt/meta/policy.hpp +++ b/src/entt/meta/policy.hpp @@ -60,7 +60,7 @@ struct as_is_t final: private internal::meta_policy { */ template struct is_meta_policy - : stl::bool_constant> {}; + : stl::bool_constant> {}; /** * @brief Helper variable template. diff --git a/src/entt/meta/utility.hpp b/src/entt/meta/utility.hpp index 65bf72c15..f3c34e86f 100644 --- a/src/entt/meta/utility.hpp +++ b/src/entt/meta/utility.hpp @@ -48,8 +48,8 @@ template struct meta_function_descriptor : meta_function_descriptor_traits< Ret, - stl::conditional_t, type_list, type_list>, - !std::is_base_of_v, + stl::conditional_t, type_list, type_list>, + !stl::is_base_of_v, true> {}; /** @@ -63,8 +63,8 @@ template struct meta_function_descriptor : meta_function_descriptor_traits< Ret, - stl::conditional_t, type_list, type_list>, - !std::is_base_of_v, + stl::conditional_t, type_list, type_list>, + !stl::is_base_of_v, false> {}; /** @@ -77,8 +77,8 @@ template struct meta_function_descriptor : meta_function_descriptor_traits< Ret &, - stl::conditional_t, type_list<>, type_list>, - !std::is_base_of_v, + stl::conditional_t, type_list<>, type_list>, + !stl::is_base_of_v, false> {}; /** @@ -93,11 +93,11 @@ struct meta_function_descriptor : meta_function_descriptor_traits< Ret, stl::conditional_t< - stl::is_same_v, Type> || std::is_base_of_v, Type>, + stl::is_same_v, Type> || stl::is_base_of_v, Type>, type_list, type_list>, - !(stl::is_same_v, Type> || std::is_base_of_v, Type>), - stl::is_const_v> && (stl::is_same_v, Type> || std::is_base_of_v, Type>)> {}; + !(stl::is_same_v, Type> || stl::is_base_of_v, Type>), + stl::is_const_v> && (stl::is_same_v, Type> || stl::is_base_of_v, Type>)> {}; /** * @brief Meta function descriptor. diff --git a/src/entt/signal/emitter.hpp b/src/entt/signal/emitter.hpp index b8f882154..72493b301 100644 --- a/src/entt/signal/emitter.hpp +++ b/src/entt/signal/emitter.hpp @@ -80,7 +80,7 @@ public: /*! @brief Default destructor. */ virtual ~emitter() { - static_assert(std::is_base_of_v, Derived>, "Invalid emitter type"); + static_assert(stl::is_base_of_v, Derived>, "Invalid emitter type"); } /** diff --git a/src/entt/stl/type_traits.hpp b/src/entt/stl/type_traits.hpp index f5c1ea958..af0fd21da 100644 --- a/src/entt/stl/type_traits.hpp +++ b/src/entt/stl/type_traits.hpp @@ -17,6 +17,7 @@ using std::invoke_result_t; using std::is_aggregate_v; using std::is_arithmetic_v; using std::is_array_v; +using std::is_base_of_v; using std::is_class_v; using std::is_const_v; using std::is_constructible_v;