diff --git a/src/entt/meta/container.hpp b/src/entt/meta/container.hpp index 4a3f54d5d..37ff50cc3 100644 --- a/src/entt/meta/container.hpp +++ b/src/entt/meta/container.hpp @@ -22,7 +22,7 @@ namespace entt { * @tparam Args Other arguments. */ template -struct meta_sequence_container_traits_t> { +struct meta_sequence_container_traits> { /*! @brief Iterator type of the sequence container. */ using iterator = typename std::vector::iterator; /*! @brief Unsigned integer type. */ @@ -119,7 +119,7 @@ struct meta_sequence_container_traits_t> { * @tparam N The number of elements. */ template -struct meta_sequence_container_traits_t> { +struct meta_sequence_container_traits> { /*! @brief Iterator type of the sequence container. */ using iterator = typename std::array::iterator; /*! @brief Unsigned integer type. */ @@ -208,7 +208,7 @@ struct meta_sequence_container_traits_t> { * @tparam Args Other arguments. */ template -struct meta_associative_container_traits_t> { +struct meta_associative_container_traits> { /*! @brief Iterator type of the associative container. */ using iterator = typename std::map::iterator; /*! @brief Unsigned integer type. */ @@ -299,7 +299,7 @@ struct meta_associative_container_traits_t> { * @tparam Args Other arguments. */ template -struct meta_associative_container_traits_t> { +struct meta_associative_container_traits> { /*! @brief Iterator type of the associative container. */ using iterator = typename std::unordered_map::iterator; /*! @brief Unsigned integer type. */ @@ -388,7 +388,7 @@ struct meta_associative_container_traits_t -struct meta_associative_container_traits_t> { +struct meta_associative_container_traits> { /*! @brief Iterator type of the associative container. */ using iterator = typename std::set::iterator; /*! @brief Unsigned integer type. */ @@ -474,7 +474,7 @@ struct meta_associative_container_traits_t> { * @tparam Args Other arguments. */ template -struct meta_associative_container_traits_t> { +struct meta_associative_container_traits> { /*! @brief Iterator type of the associative container. */ using iterator = typename std::unordered_set::iterator; /*! @brief Unsigned integer type. */ diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index e965a9b4d..518fad50f 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -73,7 +73,7 @@ class meta_associative_container { struct has_mapped_type: std::false_type {}; template - struct has_mapped_type::mapped_type>> + struct has_mapped_type::mapped_type>> : std::true_type {}; @@ -1605,46 +1605,46 @@ private: template struct meta_sequence_container::meta_sequence_container_proxy { [[nodiscard]] static meta_type value_type() { - return internal::meta_info::value_type>::resolve(); + return internal::meta_info::value_type>::resolve(); } [[nodiscard]] static size_type size(const void *container) { - return meta_sequence_container_traits_t::size(*static_cast(container)); + return meta_sequence_container_traits::size(*static_cast(container)); } [[nodiscard]] static bool resize(void *container, size_type sz) { - return meta_sequence_container_traits_t::resize(*static_cast(container), sz); + return meta_sequence_container_traits::resize(*static_cast(container), sz); } [[nodiscard]] static bool clear(void *container) { - return meta_sequence_container_traits_t::clear(*static_cast(container)); + return meta_sequence_container_traits::clear(*static_cast(container)); } [[nodiscard]] static iterator begin(void *container) { - return iterator{std::in_place_type, meta_sequence_container_traits_t::begin(*static_cast(container))}; + return iterator{std::in_place_type, meta_sequence_container_traits::begin(*static_cast(container))}; } [[nodiscard]] static iterator end(void *container) { - return iterator{std::in_place_type, meta_sequence_container_traits_t::end(*static_cast(container))}; + return iterator{std::in_place_type, meta_sequence_container_traits::end(*static_cast(container))}; } [[nodiscard]] static std::pair insert(void *container, iterator it, meta_any any) { - std::pair::iterator, bool> ret{{}, false}; + std::pair::iterator, bool> ret{{}, false}; - if(const auto *value = any.try_cast::value_type>(); value) { - ret = meta_sequence_container_traits_t::insert(*static_cast(container), it.handle().cast::iterator>(), *value); + if(const auto *value = any.try_cast::value_type>(); value) { + ret = meta_sequence_container_traits::insert(*static_cast(container), it.handle().cast::iterator>(), *value); } return {iterator{std::in_place_type, std::move(ret.first)}, ret.second}; } [[nodiscard]] static std::pair erase(void *container, iterator it) { - auto ret = meta_sequence_container_traits_t::erase(*static_cast(container), it.handle().cast::iterator>()); + auto ret = meta_sequence_container_traits::erase(*static_cast(container), it.handle().cast::iterator>()); return {iterator{std::in_place_type, std::move(ret.first)}, ret.second}; } [[nodiscard]] static meta_any get(void *container, size_type pos) { - return std::ref(meta_sequence_container_traits_t::get(*static_cast(container), pos)); + return std::ref(meta_sequence_container_traits::get(*static_cast(container), pos)); } }; @@ -1790,47 +1790,47 @@ struct meta_associative_container::meta_associative_container_proxy { static constexpr auto has_mapped_type = meta_associative_container::has_mapped_type::value; [[nodiscard]] static meta_type key_type() { - return internal::meta_info::key_type>::resolve(); + return internal::meta_info::key_type>::resolve(); } [[nodiscard]] static meta_type mapped_type() { if constexpr(has_mapped_type) { - return internal::meta_info::mapped_type>::resolve(); + return internal::meta_info::mapped_type>::resolve(); } else { return meta_type{}; } } [[nodiscard]] static meta_type value_type() { - return internal::meta_info::value_type>::resolve(); + return internal::meta_info::value_type>::resolve(); } [[nodiscard]] static size_type size(const void *container) { - return meta_associative_container_traits_t::size(*static_cast(container)); + return meta_associative_container_traits::size(*static_cast(container)); } [[nodiscard]] static bool clear(void *container) { - return meta_associative_container_traits_t::clear(*static_cast(container)); + return meta_associative_container_traits::clear(*static_cast(container)); } [[nodiscard]] static iterator begin(void *container) { - return iterator{std::in_place_type, meta_associative_container_traits_t::begin(*static_cast(container))}; + return iterator{std::in_place_type, meta_associative_container_traits::begin(*static_cast(container))}; } [[nodiscard]] static iterator end(void *container) { - return iterator{std::in_place_type, meta_associative_container_traits_t::end(*static_cast(container))}; + return iterator{std::in_place_type, meta_associative_container_traits::end(*static_cast(container))}; } [[nodiscard]] static bool insert(void *container, meta_any key, meta_any value) { bool ret = false; - if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { + if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { if constexpr(has_mapped_type) { - if(auto *m_ptr = value.try_cast::mapped_type>(); m_ptr) { - ret = meta_associative_container_traits_t::insert(*static_cast(container), *k_ptr, *m_ptr); + if(auto *m_ptr = value.try_cast::mapped_type>(); m_ptr) { + ret = meta_associative_container_traits::insert(*static_cast(container), *k_ptr, *m_ptr); } } else { - ret = meta_associative_container_traits_t::insert(*static_cast(container), *k_ptr); + ret = meta_associative_container_traits::insert(*static_cast(container), *k_ptr); } } @@ -1840,8 +1840,8 @@ struct meta_associative_container::meta_associative_container_proxy { [[nodiscard]] static bool erase(void *container, meta_any key) { bool ret = false; - if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { - ret = meta_associative_container_traits_t::erase(*static_cast(container), *k_ptr); + if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { + ret = meta_associative_container_traits::erase(*static_cast(container), *k_ptr); } return ret; @@ -1850,8 +1850,8 @@ struct meta_associative_container::meta_associative_container_proxy { [[nodiscard]] static iterator find(void *container, meta_any key) { iterator ret{}; - if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { - ret = iterator{std::in_place_type, meta_associative_container_traits_t::find(*static_cast(container), *k_ptr)}; + if(const auto *k_ptr = key.try_cast::key_type>(); k_ptr) { + ret = iterator{std::in_place_type, meta_associative_container_traits::find(*static_cast(container), *k_ptr)}; } return ret; diff --git a/src/entt/meta/type_traits.hpp b/src/entt/meta/type_traits.hpp index 0ca52f6a3..52a0c0630 100644 --- a/src/entt/meta/type_traits.hpp +++ b/src/entt/meta/type_traits.hpp @@ -13,7 +13,7 @@ namespace entt { * sequence containers. */ template -struct meta_sequence_container_traits_t; +struct meta_sequence_container_traits; /** @@ -21,7 +21,7 @@ struct meta_sequence_container_traits_t; * associative containers. */ template -struct meta_associative_container_traits_t; +struct meta_associative_container_traits; /** @@ -35,7 +35,7 @@ struct has_meta_sequence_container_traits: std::false_type {}; /*! @copydoc has_meta_sequence_container_traits */ template -struct has_meta_sequence_container_traits::value_type>> +struct has_meta_sequence_container_traits::value_type>> : std::true_type {}; @@ -59,7 +59,7 @@ struct has_meta_associative_container_traits: std::false_type {}; /*! @copydoc has_meta_associative_container_traits */ template -struct has_meta_associative_container_traits::key_type>> +struct has_meta_associative_container_traits::key_type>> : std::true_type {};