Sfoglia il codice sorgente

meta:
* removed has_meta_sequence_container[_v]
* removed has_meta_associative_container[_v]

Michele Caini 5 anni fa
parent
commit
a85712e8aa
3 ha cambiato i file con 5 aggiunte e 53 eliminazioni
  1. 2 2
      src/entt/meta/meta.hpp
  2. 2 2
      src/entt/meta/node.hpp
  3. 1 49
      src/entt/meta/type_traits.hpp

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

@@ -183,13 +183,13 @@ class meta_any {
             break;
         case operation::SEQ:
         case operation::CSEQ:
-            if constexpr(has_meta_sequence_container_traits_v<Type>) {
+            if constexpr(is_complete_v<meta_sequence_container_traits<Type>>) {
                 *static_cast<meta_sequence_container *>(to) = { std::in_place_type<Type>, (op == operation::SEQ ? const_cast<any &>(from).as_ref() : from.as_ref()) };
             }
             break;
         case operation::ASSOC:
         case operation::CASSOC:
-            if constexpr(has_meta_associative_container_traits_v<Type>) {
+            if constexpr(is_complete_v<meta_associative_container_traits<Type>>) {
                 *static_cast<meta_associative_container *>(to) = { std::in_place_type<Type>, (op == operation::ASSOC ? const_cast<any &>(from).as_ref() : from.as_ref()) };
             }
             break;

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

@@ -231,8 +231,8 @@ public:
             std::is_member_object_pointer_v<Type>,
             std::is_member_function_pointer_v<Type>,
             is_meta_pointer_like_v<Type>,
-            has_meta_sequence_container_traits_v<Type>,
-            has_meta_associative_container_traits_v<Type>,
+            is_complete_v<meta_sequence_container_traits<Type>>,
+            is_complete_v<meta_associative_container_traits<Type>>,
             template_info(type_identity<Type>{}),
             std::rank_v<Type>,
             [](meta_type_node::size_type dim) ENTT_NOEXCEPT { return extent(dim, std::make_index_sequence<std::rank_v<Type>>{}); },

+ 1 - 49
src/entt/meta/type_traits.hpp

@@ -24,54 +24,6 @@ template<typename>
 struct meta_associative_container_traits;
 
 
-/**
- * @brief Provides the member constant `value` to true if support for meta
- * sequence containers is enabled for the given type, false otherwise.
- * @tparam Type Potentially sequence container type.
- */
-template<typename Type, typename = void>
-struct has_meta_sequence_container_traits: std::false_type {};
-
-
-/*! @copydoc has_meta_sequence_container_traits */
-template<typename Type>
-struct has_meta_sequence_container_traits<Type, std::void_t<typename meta_sequence_container_traits<Type>::type::value_type>>
-        : std::true_type
-{};
-
-
-/**
- * @brief Helper variable template.
- * @tparam Type Potentially sequence container type.
- */
-template<typename Type>
-inline constexpr auto has_meta_sequence_container_traits_v = has_meta_sequence_container_traits<Type>::value;
-
-
-/**
- * @brief Provides the member constant `value` to true if support for meta
- * associative containers is enabled for the given type, false otherwise.
- * @tparam Type Potentially associative container type.
- */
-template<typename, typename = void>
-struct has_meta_associative_container_traits: std::false_type {};
-
-
-/*! @copydoc has_meta_associative_container_traits */
-template<typename Type>
-struct has_meta_associative_container_traits<Type, std::void_t<typename meta_associative_container_traits<Type>::type::key_type>>
-        : std::true_type
-{};
-
-
-/**
- * @brief Helper variable template.
- * @tparam Type Potentially associative container type.
- */
-template<typename Type>
-inline constexpr auto has_meta_associative_container_traits_v = has_meta_associative_container_traits<Type>::value;
-
-
 /**
  * @brief Provides the member constant `value` to true if a meta associative
  * container claims to wrap a key-only type, false otherwise.
@@ -84,7 +36,7 @@ struct is_key_only_meta_associative_container: std::true_type {};
 /*! @copydoc is_key_only_meta_associative_container */
 template<typename Type>
 struct is_key_only_meta_associative_container<Type, std::void_t<typename meta_associative_container_traits<Type>::type::mapped_type>>
-        : std::false_type
+    : std::false_type
 {};