meta: cleanup

src/entt/meta/container.hpp

@@ -66,9 +66,9 @@ struct basic_meta_sequence_container_traits {
     static_assert(std::is_same_v<Type, std::remove_const_t<std::remove_reference_t<Type>>>, "Unexpected type");
 
     /*! @brief Unsigned integer type. */
-    using size_type = typename meta_sequence_container::size_type;
+    using size_type = meta_sequence_container::size_type;
     /*! @brief Meta iterator type. */
-    using iterator = typename meta_sequence_container::iterator;
+    using iterator = meta_sequence_container::iterator;
 
     /*! @brief Number of elements, or `meta_dynamic_extent` if dynamic. */
     static constexpr std::size_t extent = internal::sequence_container_extent_v<Type>;
@@ -158,7 +158,7 @@ struct basic_meta_sequence_container_traits {
             auto *const non_const = any_cast<typename Type::iterator>(&it.base());
             return {area, static_cast<Type *>(container)->insert(
                               non_const ? *non_const : any_cast<const typename Type::const_iterator &>(it.base()),
-                              (value != nullptr) ? *static_cast<const typename Type::value_type *>(value) : *static_cast<const std::remove_reference_t<typename Type::const_reference> *>(cref))};
+                              (value != nullptr) ? *static_cast<const Type::value_type *>(value) : *static_cast<const std::remove_reference_t<typename Type::const_reference> *>(cref))};
         } else {
             return iterator{};
         }
@@ -190,9 +190,9 @@ struct basic_meta_associative_container_traits {
     static_assert(std::is_same_v<Type, std::remove_const_t<std::remove_reference_t<Type>>>, "Unexpected type");
 
     /*! @brief Unsigned integer type. */
-    using size_type = typename meta_associative_container::size_type;
+    using size_type = meta_associative_container::size_type;
     /*! @brief Meta iterator type. */
-    using iterator = typename meta_associative_container::iterator;
+    using iterator = meta_associative_container::iterator;
 
     /*! @brief True in case of key-only containers, false otherwise. */
     static constexpr bool key_only = internal::key_only_associative_container_v<Type>;
@@ -255,9 +255,9 @@ struct basic_meta_associative_container_traits {
      */
     [[nodiscard]] static bool insert(void *container, const void *key, [[maybe_unused]] const void *value) {
         if constexpr(key_only) {
-            return static_cast<Type *>(container)->insert(*static_cast<const typename Type::key_type *>(key)).second;
+            return static_cast<Type *>(container)->insert(*static_cast<const Type::key_type *>(key)).second;
         } else {
-            return static_cast<Type *>(container)->emplace(*static_cast<const typename Type::key_type *>(key), *static_cast<const typename Type::mapped_type *>(value)).second;
+            return static_cast<Type *>(container)->emplace(*static_cast<const Type::key_type *>(key), *static_cast<const Type::mapped_type *>(value)).second;
         }
     }
 
@@ -268,7 +268,7 @@ struct basic_meta_associative_container_traits {
      * @return Number of elements removed (either 0 or 1).
      */
     [[nodiscard]] static size_type erase(void *container, const void *key) {
-        return static_cast<Type *>(container)->erase(*static_cast<const typename Type::key_type *>(key));
+        return static_cast<Type *>(container)->erase(*static_cast<const Type::key_type *>(key));
     }
 
     /**
@@ -280,8 +280,8 @@ struct basic_meta_associative_container_traits {
      * @return An iterator to the element with the given key, if any.
      */
     static iterator find(const meta_ctx &area, void *container, const void *as_const, const void *key) {
-        return (container != nullptr) ? iterator{area, std::bool_constant<key_only>{}, static_cast<Type *>(container)->find(*static_cast<const typename Type::key_type *>(key))}
-                                      : iterator{area, std::bool_constant<key_only>{}, static_cast<const Type *>(as_const)->find(*static_cast<const typename Type::key_type *>(key))};
+        return (container != nullptr) ? iterator{area, std::bool_constant<key_only>{}, static_cast<Type *>(container)->find(*static_cast<const Type::key_type *>(key))}
+                                      : iterator{area, std::bool_constant<key_only>{}, static_cast<const Type *>(as_const)->find(*static_cast<const Type::key_type *>(key))};
     }
 };
 

src/entt/meta/factory.hpp

@@ -409,7 +409,7 @@ public:
                     &meta_setter<Type, Setter>,
                     &meta_getter<Type, Getter, Policy>});
         } else {
-            using args_type = typename meta_function_helper_t<Type, decltype(Setter)>::args_type;
+            using args_type = meta_function_helper_t<Type, decltype(Setter)>::args_type;
 
             base_type::data(
                 internal::meta_data_node{

src/entt/meta/meta.hpp

@@ -785,7 +785,7 @@ class meta_data {
 
 public:
     /*! @brief Unsigned integer type. */
-    using size_type = typename internal::meta_data_node::size_type;
+    using size_type = internal::meta_data_node::size_type;
 
     /*! @brief Default constructor. */
     meta_data() noexcept = default;
@@ -925,7 +925,7 @@ class meta_func {
 
 public:
     /*! @brief Unsigned integer type. */
-    using size_type = typename internal::meta_func_node::size_type;
+    using size_type = internal::meta_func_node::size_type;
 
     /*! @brief Default constructor. */
     meta_func() noexcept = default;
@@ -1057,7 +1057,7 @@ class meta_type {
     }
 
     template<typename Func>
-    [[nodiscard]] auto lookup(meta_any *const args, const typename internal::meta_type_node::size_type sz, [[maybe_unused]] bool constness, Func next) const {
+    [[nodiscard]] auto lookup(meta_any *const args, const internal::meta_type_node::size_type sz, [[maybe_unused]] bool constness, Func next) const {
         decltype(next()) candidate = nullptr;
         size_type same{};
         bool ambiguous{};
@@ -1111,7 +1111,7 @@ class meta_type {
 
 public:
     /*! @brief Unsigned integer type. */
-    using size_type = typename internal::meta_type_node::size_type;
+    using size_type = internal::meta_type_node::size_type;
 
     /*! @brief Default constructor. */
     meta_type() noexcept = default;
@@ -1325,8 +1325,8 @@ public:
      * @brief Returns a range to visit registered top-level base meta types.
      * @return An iterable range to visit registered top-level base meta types.
      */
-    [[nodiscard]] meta_range<meta_type, typename decltype(internal::meta_type_descriptor::base)::const_iterator> base() const noexcept {
-        using range_type = meta_range<meta_type, typename decltype(internal::meta_type_descriptor::base)::const_iterator>;
+    [[nodiscard]] meta_range<meta_type, decltype(internal::meta_type_descriptor::base)::const_iterator> base() const noexcept {
+        using range_type = meta_range<meta_type, decltype(internal::meta_type_descriptor::base)::const_iterator>;
         return fetch_node().details ? range_type{{*ctx, fetch_node().details->base.cbegin()}, {*ctx, fetch_node().details->base.cend()}} : range_type{};
     }
 
@@ -1334,8 +1334,8 @@ public:
      * @brief Returns a range to visit registered top-level meta data.
      * @return An iterable range to visit registered top-level meta data.
      */
-    [[nodiscard]] meta_range<meta_data, typename decltype(internal::meta_type_descriptor::data)::const_iterator> data() const noexcept {
-        using range_type = meta_range<meta_data, typename decltype(internal::meta_type_descriptor::data)::const_iterator>;
+    [[nodiscard]] meta_range<meta_data, decltype(internal::meta_type_descriptor::data)::const_iterator> data() const noexcept {
+        using range_type = meta_range<meta_data, decltype(internal::meta_type_descriptor::data)::const_iterator>;
         return fetch_node().details ? range_type{{*ctx, fetch_node().details->data.cbegin()}, {*ctx, fetch_node().details->data.cend()}} : range_type{};
     }
 
@@ -1354,8 +1354,8 @@ public:
      * @brief Returns a range to visit registered top-level functions.
      * @return An iterable range to visit registered top-level functions.
      */
-    [[nodiscard]] meta_range<meta_func, typename decltype(internal::meta_type_descriptor::func)::const_iterator> func() const noexcept {
-        using return_type = meta_range<meta_func, typename decltype(internal::meta_type_descriptor::func)::const_iterator>;
+    [[nodiscard]] meta_range<meta_func, decltype(internal::meta_type_descriptor::func)::const_iterator> func() const noexcept {
+        using return_type = meta_range<meta_func, decltype(internal::meta_type_descriptor::func)::const_iterator>;
         return fetch_node().details ? return_type{{*ctx, fetch_node().details->func.cbegin()}, {*ctx, fetch_node().details->func.cend()}} : return_type{};
     }
 

src/entt/meta/node.hpp

@@ -157,7 +157,7 @@ template<auto Member, typename Type, typename Value>
         }
     }
 
-    return static_cast<typename Type::value_type *>(nullptr);
+    return static_cast<Type::value_type *>(nullptr);
 }
 
 [[nodiscard]] inline auto *find_overload(meta_func_node *curr, std::remove_pointer_t<decltype(meta_func_node::invoke)> *const ref) {
@@ -167,7 +167,7 @@ template<auto Member, typename Type, typename Value>
 
 template<auto Member>
 [[nodiscard]] auto *look_for(const meta_context &context, const meta_type_node &node, const id_type id, bool recursive) {
-    using value_type = typename std::remove_reference_t<decltype((node.details.get()->*Member))>::value_type;
+    using value_type = std::remove_reference_t<decltype((node.details.get()->*Member))>::value_type;
 
     if(node.details) {
         if(auto *member = find_member<&value_type::id>((node.details.get()->*Member), id); member != nullptr) {

src/entt/meta/range.hpp

@@ -69,7 +69,7 @@ struct meta_range_iterator final {
     }
 
     [[nodiscard]] constexpr reference operator[](const difference_type value) const noexcept {
-        if constexpr(std::is_same_v<It, typename decltype(meta_context::value)::const_iterator>) {
+        if constexpr(std::is_same_v<It, decltype(meta_context::value)::const_iterator>) {
             return {it[value].first, Type{*ctx, *it[value].second}};
         } else if constexpr(std::is_same_v<typename std::iterator_traits<It>::value_type, meta_base_node>) {
             return {it[value].type, Type{*ctx, it[value]}};

src/entt/meta/resolve.hpp

@@ -38,7 +38,7 @@ template<typename Type>
  * @param ctx The context from which to search for meta types.
  * @return An iterable range to use to visit all meta types.
  */
-[[nodiscard]] inline meta_range<meta_type, typename decltype(internal::meta_context::value)::const_iterator> resolve(const meta_ctx &ctx) noexcept {
+[[nodiscard]] inline meta_range<meta_type, decltype(internal::meta_context::value)::const_iterator> resolve(const meta_ctx &ctx) noexcept {
     const auto &context = internal::meta_context::from(ctx);
     return {{ctx, context.value.cbegin()}, {ctx, context.value.cend()}};
 }
@@ -47,7 +47,7 @@ template<typename Type>
  * @brief Returns a range to use to visit all meta types.
  * @return An iterable range to use to visit all meta types.
  */
-[[nodiscard]] inline meta_range<meta_type, typename decltype(internal::meta_context::value)::const_iterator> resolve() noexcept {
+[[nodiscard]] inline meta_range<meta_type, decltype(internal::meta_context::value)::const_iterator> resolve() noexcept {
     return resolve(locator<meta_ctx>::value_or());
 }
 

src/entt/meta/utility.hpp

@@ -149,7 +149,7 @@ public:
  * @tparam Candidate The actual function to associate with the reflected type.
  */
 template<typename Type, typename Candidate>
-using meta_function_helper_t = typename meta_function_helper<Type, Candidate>::type;
+using meta_function_helper_t = meta_function_helper<Type, Candidate>::type;
 
 /**
  * @brief Wraps a value depending on the given policy.