From 98f54029d0f3c7646ac5111c8118bf8a85f65e00 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Wed, 2 Oct 2019 23:50:30 +0200 Subject: [PATCH] some consts here and there --- src/entt/meta/factory.hpp | 28 +++++++++++++-------------- src/entt/meta/meta.hpp | 40 +++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/entt/meta/factory.hpp b/src/entt/meta/factory.hpp index 63c759b0d..433d33d36 100644 --- a/src/entt/meta/factory.hpp +++ b/src/entt/meta/factory.hpp @@ -94,8 +94,8 @@ bool setter([[maybe_unused]] meta_handle handle, [[maybe_unused]] meta_any index using helper_type = meta_function_helper_t; using data_type = std::tuple_element_t, typename helper_type::args_type>; static_assert(std::is_invocable_v); - auto *clazz = meta_any{handle}.try_cast(); - auto *direct = value.try_cast(); + auto * const clazz = meta_any{handle}.try_cast(); + auto * const direct = value.try_cast(); if(clazz && (direct || value.convert())) { std::invoke(Data, *clazz, direct ? *direct : value.cast()); @@ -104,19 +104,19 @@ bool setter([[maybe_unused]] meta_handle handle, [[maybe_unused]] meta_any index } else if constexpr(std::is_member_object_pointer_v) { using data_type = std::remove_cv_t().*Data)>>; static_assert(std::is_invocable_v); - auto *clazz = meta_any{handle}.try_cast(); + auto * const clazz = meta_any{handle}.try_cast(); if constexpr(std::is_array_v) { using underlying_type = std::remove_extent_t; - auto *direct = value.try_cast(); - auto *idx = index.try_cast(); + auto * const direct = value.try_cast(); + auto * const idx = index.try_cast(); if(clazz && idx && (direct || value.convert())) { std::invoke(Data, clazz)[*idx] = direct ? *direct : value.cast(); accepted = true; } } else { - auto *direct = value.try_cast(); + auto * const direct = value.try_cast(); if(clazz && (direct || value.convert())) { std::invoke(Data, clazz) = (direct ? *direct : value.cast()); @@ -129,15 +129,15 @@ bool setter([[maybe_unused]] meta_handle handle, [[maybe_unused]] meta_any index if constexpr(std::is_array_v) { using underlying_type = std::remove_extent_t; - auto *direct = value.try_cast(); - auto *idx = index.try_cast(); + auto * const direct = value.try_cast(); + auto * const idx = index.try_cast(); if(idx && (direct || value.convert())) { (*Data)[*idx] = (direct ? *direct : value.cast()); accepted = true; } } else { - auto *direct = value.try_cast(); + auto * const direct = value.try_cast(); if(direct || value.convert()) { *Data = (direct ? *direct : value.cast()); @@ -166,15 +166,15 @@ meta_any getter([[maybe_unused]] meta_handle handle, [[maybe_unused]] meta_any i if constexpr(std::is_function_v> || std::is_member_function_pointer_v) { static_assert(std::is_invocable_v); - auto *clazz = meta_any{handle}.try_cast(); + auto * const clazz = meta_any{handle}.try_cast(); return clazz ? dispatch(std::invoke(Data, *clazz)) : meta_any{}; } else if constexpr(std::is_member_object_pointer_v) { using data_type = std::remove_cv_t().*Data)>>; static_assert(std::is_invocable_v); - auto *clazz = meta_any{handle}.try_cast(); + auto * const clazz = meta_any{handle}.try_cast(); if constexpr(std::is_array_v) { - auto *idx = index.try_cast(); + auto * const idx = index.try_cast(); return (clazz && idx) ? dispatch(std::invoke(Data, clazz)[*idx]) : meta_any{}; } else { return clazz ? dispatch(std::invoke(Data, clazz)) : meta_any{}; @@ -183,7 +183,7 @@ meta_any getter([[maybe_unused]] meta_handle handle, [[maybe_unused]] meta_any i static_assert(std::is_pointer_v>); if constexpr(std::is_array_v>) { - auto *idx = index.try_cast(); + auto * const idx = index.try_cast(); return idx ? dispatch((*Data)[*idx]) : meta_any{}; } else { return dispatch(*Data); @@ -221,7 +221,7 @@ meta_any invoke([[maybe_unused]] meta_handle handle, meta_any *args, std::index_ if constexpr(std::is_function_v>) { return (std::get(direct) && ...) ? dispatch(std::get(direct)...) : meta_any{}; } else { - auto *clazz = meta_any{handle}.try_cast(); + auto * const clazz = meta_any{handle}.try_cast(); return (clazz && (std::get(direct) && ...)) ? dispatch(clazz, std::get(direct)...) : meta_any{}; } } diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index 400e1684f..17b7854fc 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -216,7 +216,7 @@ auto find_if(Op op, const meta_type_node *node) ENTT_NOEXCEPT template const Type * try_cast(const meta_type_node *node, void *instance) ENTT_NOEXCEPT { - const auto *type = meta_info::resolve(); + const auto * const type = meta_info::resolve(); void *ret = nullptr; if(node == type) { @@ -293,8 +293,8 @@ class meta_any { } static void destroy(void *instance) { - auto *node = internal::meta_info::resolve(); - auto *actual = static_cast(instance); + auto * const node = internal::meta_info::resolve(); + auto * const actual = static_cast(instance); [[maybe_unused]] const bool destroyed = node->meta().destroy(*actual); ENTT_ASSERT(destroyed); delete actual; @@ -307,7 +307,7 @@ class meta_any { } static void * steal(storage_type &to, void *from, destroy_fn_type *) { - auto *instance = static_cast(from); + auto * const instance = static_cast(from); new (&to) Type *{instance}; return instance; } @@ -321,8 +321,8 @@ class meta_any { } static void destroy(void *instance) { - auto *node = internal::meta_info::resolve(); - auto *actual = static_cast(instance); + auto * const node = internal::meta_info::resolve(); + auto * const actual = static_cast(instance); [[maybe_unused]] const bool destroyed = node->meta().destroy(*actual); ENTT_ASSERT(destroyed); actual->~Type(); @@ -333,7 +333,7 @@ class meta_any { } static void * steal(storage_type &to, void *from, destroy_fn_type *destroy_fn) { - void *instance = new (&to) Type{std::move(*static_cast(from))}; + void * const instance = new (&to) Type{std::move(*static_cast(from))}; destroy_fn(from); return instance; } @@ -518,7 +518,7 @@ public: */ template const Type & cast() const ENTT_NOEXCEPT { - auto *actual = try_cast(); + auto * const actual = try_cast(); ENTT_ASSERT(actual); return *actual; } @@ -539,10 +539,10 @@ public: meta_any convert() const { meta_any any{}; - if(const auto *type = internal::meta_info::resolve(); node == type) { + if(const auto * const type = internal::meta_info::resolve(); node == type) { any = *static_cast(instance); } else { - const auto *conv = internal::find_if<&internal::meta_type_node::conv>([type](auto *other) { + const auto * const conv = internal::find_if<&internal::meta_type_node::conv>([type](auto *other) { return other->type() == type; }, node); @@ -611,7 +611,7 @@ public: friend void swap(meta_any &lhs, meta_any &rhs) ENTT_NOEXCEPT { if(lhs.steal_fn && rhs.steal_fn) { storage_type buffer; - auto *temp = lhs.steal_fn(buffer, lhs.instance, lhs.destroy_fn); + auto * const temp = lhs.steal_fn(buffer, lhs.instance, lhs.destroy_fn); lhs.instance = rhs.steal_fn(lhs.storage, rhs.instance, rhs.destroy_fn); rhs.instance = lhs.steal_fn(rhs.storage, temp, lhs.destroy_fn); } else if(lhs.steal_fn) { @@ -1034,7 +1034,7 @@ public: template std::enable_if_t, meta_prop> prop(Key &&key) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { + const auto * const curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { return candidate->key() == key; }, node->prop); @@ -1299,7 +1299,7 @@ public: template std::enable_if_t, meta_prop> prop(Key &&key) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { + const auto * const curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { return candidate->key() == key; }, node->prop); @@ -1468,7 +1468,7 @@ public: template std::enable_if_t, meta_prop> prop(Key &&key) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { + const auto * const curr = internal::find_if([key = meta_any{std::forward(key)}](auto *candidate) { return candidate->key() == key; }, node->prop); @@ -1682,7 +1682,7 @@ public: * @return The meta base associated with the given identifier, if any. */ meta_base base(const ENTT_ID_TYPE identifier) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if<&internal::meta_type_node::base>([identifier](auto *candidate) { + const auto * const curr = internal::find_if<&internal::meta_type_node::base>([identifier](auto *candidate) { return candidate->type()->identifier == identifier; }, node); @@ -1717,7 +1717,7 @@ public: */ template meta_conv conv() const ENTT_NOEXCEPT { - const auto *curr = internal::find_if<&internal::meta_type_node::conv>([type = internal::meta_info::resolve()](auto *candidate) { + const auto * const curr = internal::find_if<&internal::meta_type_node::conv>([type = internal::meta_info::resolve()](auto *candidate) { return candidate->type() == type; }, node); @@ -1743,7 +1743,7 @@ public: */ template meta_ctor ctor() const ENTT_NOEXCEPT { - const auto *curr = internal::ctor(std::make_index_sequence{}, node); + const auto * const curr = internal::ctor(std::make_index_sequence{}, node); return curr ? curr->meta() : meta_ctor{}; } @@ -1783,7 +1783,7 @@ public: * @return The meta data associated with the given identifier, if any. */ meta_data data(const ENTT_ID_TYPE identifier) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if<&internal::meta_type_node::data>([identifier](auto *candidate) { + const auto * const curr = internal::find_if<&internal::meta_type_node::data>([identifier](auto *candidate) { return candidate->identifier == identifier; }, node); @@ -1819,7 +1819,7 @@ public: * @return The meta function associated with the given identifier, if any. */ meta_func func(const ENTT_ID_TYPE identifier) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if<&internal::meta_type_node::func>([identifier](auto *candidate) { + const auto * const curr = internal::find_if<&internal::meta_type_node::func>([identifier](auto *candidate) { return candidate->identifier == identifier; }, node); @@ -1900,7 +1900,7 @@ public: template std::enable_if_t, meta_prop> prop(Key &&key) const ENTT_NOEXCEPT { - const auto *curr = internal::find_if<&internal::meta_type_node::prop>([key = meta_any{std::forward(key)}](auto *candidate) { + const auto * const curr = internal::find_if<&internal::meta_type_node::prop>([key = meta_any{std::forward(key)}](auto *candidate) { return candidate->key() == key; }, node);