diff --git a/headers/meta.hpp/meta_base.hpp b/headers/meta.hpp/meta_base.hpp index 1e2aa17..1ae7f8f 100644 --- a/headers/meta.hpp/meta_base.hpp +++ b/headers/meta.hpp/meta_base.hpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/headers/meta.hpp/meta_registry/class_bind.hpp b/headers/meta.hpp/meta_registry/class_bind.hpp index d2da779..36ba7cc 100644 --- a/headers/meta.hpp/meta_registry/class_bind.hpp +++ b/headers/meta.hpp/meta_registry/class_bind.hpp @@ -53,7 +53,7 @@ namespace meta_hpp template < detail::class_kind Class > template < detail::member_kind Member > class_bind& class_bind::member_(std::string name, Member member) { - static_assert(std::same_as::class_type>); + static_assert(std::is_same_v::class_type>); auto member_state = detail::member_state::make(std::move(name), std::move(member)); data_->members.emplace(member_state->index, std::move(member_state)); return *this; @@ -62,7 +62,7 @@ namespace meta_hpp template < detail::class_kind Class > template < detail::method_kind Method > class_bind& class_bind::method_(std::string name, Method method) { - static_assert(std::same_as::class_type>); + static_assert(std::is_same_v::class_type>); auto method_state = detail::method_state::make(std::move(name), std::move(method)); data_->methods.emplace(method_state->index, std::move(method_state)); return *this; diff --git a/headers/meta.hpp/meta_states.hpp b/headers/meta.hpp/meta_states.hpp index 15d1079..ef4bb2b 100644 --- a/headers/meta.hpp/meta_states.hpp +++ b/headers/meta.hpp/meta_states.hpp @@ -16,13 +16,13 @@ namespace meta_hpp { template < typename T > concept state_family = - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as; + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v; } template < detail::state_family T, detail::state_family U > diff --git a/headers/meta.hpp/meta_types.hpp b/headers/meta.hpp/meta_types.hpp index 3fecedc..db92632 100644 --- a/headers/meta.hpp/meta_types.hpp +++ b/headers/meta.hpp/meta_types.hpp @@ -64,18 +64,18 @@ namespace meta_hpp { template < typename T > concept type_family = - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as; + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v; template < type_family T > [[nodiscard]] auto data_access(const T& type) { diff --git a/headers/meta.hpp/meta_utilities.hpp b/headers/meta.hpp/meta_utilities.hpp index 109590b..ef2b588 100644 --- a/headers/meta.hpp/meta_utilities.hpp +++ b/headers/meta.hpp/meta_utilities.hpp @@ -60,7 +60,7 @@ namespace meta_hpp::detail { template < typename T > concept value_kind = - std::same_as; + std::is_same_v; template < typename T > concept decay_value_kind = @@ -68,11 +68,11 @@ namespace meta_hpp::detail template < typename T > concept uvalue_kind = - std::same_as || - std::same_as || - std::same_as || - std::same_as || - std::same_as; + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v || + std::is_same_v; template < typename T > concept decay_uvalue_kind = diff --git a/untests/meta_utilities/detail_tests.cpp b/untests/meta_utilities/detail_tests.cpp index 2669d0d..9e2dd61 100644 --- a/untests/meta_utilities/detail_tests.cpp +++ b/untests/meta_utilities/detail_tests.cpp @@ -57,28 +57,28 @@ TEST_CASE("features/meta_utilities/detail") { } SUBCASE("cvref_traits::copy_to") { - static_assert(std::same_as::copy_to, int>); - static_assert(std::same_as::copy_to, const int>); - static_assert(std::same_as::copy_to, const volatile int>); - static_assert(std::same_as::copy_to, int&>); - static_assert(std::same_as::copy_to, const int&>); - static_assert(std::same_as::copy_to, volatile int&>); - static_assert(std::same_as::copy_to, const volatile int&&>); + static_assert(std::is_same_v::copy_to, int>); + static_assert(std::is_same_v::copy_to, const int>); + static_assert(std::is_same_v::copy_to, const volatile int>); + static_assert(std::is_same_v::copy_to, int&>); + static_assert(std::is_same_v::copy_to, const int&>); + static_assert(std::is_same_v::copy_to, volatile int&>); + static_assert(std::is_same_v::copy_to, const volatile int&&>); - static_assert(std::same_as::copy_to, int>); - static_assert(std::same_as::copy_to, const int>); - static_assert(std::same_as::copy_to, const volatile int>); - static_assert(std::same_as::copy_to, int&>); - static_assert(std::same_as::copy_to, const int&>); - static_assert(std::same_as::copy_to, volatile int&>); - static_assert(std::same_as::copy_to, const volatile int&&>); + static_assert(std::is_same_v::copy_to, int>); + static_assert(std::is_same_v::copy_to, const int>); + static_assert(std::is_same_v::copy_to, const volatile int>); + static_assert(std::is_same_v::copy_to, int&>); + static_assert(std::is_same_v::copy_to, const int&>); + static_assert(std::is_same_v::copy_to, volatile int&>); + static_assert(std::is_same_v::copy_to, const volatile int&&>); - static_assert(std::same_as::copy_to, int>); - static_assert(std::same_as::copy_to, const int>); - static_assert(std::same_as::copy_to, const volatile int>); - static_assert(std::same_as::copy_to, int&>); - static_assert(std::same_as::copy_to, const int&>); - static_assert(std::same_as::copy_to, volatile int&>); - static_assert(std::same_as::copy_to, const volatile int&&>); + static_assert(std::is_same_v::copy_to, int>); + static_assert(std::is_same_v::copy_to, const int>); + static_assert(std::is_same_v::copy_to, const volatile int>); + static_assert(std::is_same_v::copy_to, int&>); + static_assert(std::is_same_v::copy_to, const int&>); + static_assert(std::is_same_v::copy_to, volatile int&>); + static_assert(std::is_same_v::copy_to, const volatile int&&>); } }