From c8639ae43417c25638e4120751a8de40dcf94044 Mon Sep 17 00:00:00 2001 From: Michele Caini Date: Tue, 23 Feb 2021 12:00:59 +0100 Subject: [PATCH] meta: minor changes --- src/entt/meta/meta.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index a2e15fcca..1b2d27c0d 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -174,7 +174,7 @@ class meta_any { } else if constexpr(!std::is_same_v) { if constexpr(std::is_reference_v::dereference(std::declval()))>) { auto &&obj = adl_meta_pointer_like::dereference(any_cast(from)); - *static_cast(to) = (op == operation::DEREF ? meta_any{std::reference_wrapper{obj}} : meta_any{std::cref(obj)}); + *static_cast(to) = (op == operation::DEREF ? meta_any{std::ref(obj)} : meta_any{std::cref(obj)}); } else { *static_cast(to) = adl_meta_pointer_like::dereference(any_cast(from)); } @@ -603,7 +603,7 @@ struct meta_handle { if constexpr(std::is_same_v>, meta_any>) { any = value.as_ref(); } else { - any = std::reference_wrapper{value}; + any = std::ref(value); } } @@ -1642,7 +1642,7 @@ class meta_sequence_container::meta_iterator { break; case operation::DEREF: if constexpr(std::is_lvalue_reference_v::reference>) { - *static_cast(to) = std::reference_wrapper{*any_cast(from)}; + *static_cast(to) = std::ref(*any_cast(from)); } else { *static_cast(to) = *any_cast(from); } @@ -1792,14 +1792,14 @@ struct meta_sequence_container::meta_sequence_container_proxy { [[nodiscard]] static meta_any get(any &container, size_type pos) { if(auto * const cont = any_cast(&container); cont) { if constexpr(std::is_lvalue_reference_v) { - return std::reference_wrapper{traits_type::get(*cont, pos)}; + return std::ref(traits_type::get(*cont, pos)); } else { return traits_type::get(*cont, pos); } } if constexpr(std::is_lvalue_reference_v) { - return std::reference_wrapper{traits_type::cget(any_cast(container), pos)}; + return std::ref(traits_type::cget(any_cast(container), pos)); } else { return traits_type::cget(any_cast(container), pos); } @@ -1921,7 +1921,7 @@ class meta_associative_container::meta_iterator { if constexpr(KeyOnly) { static_cast *>(to)->first = std::cref(*any_cast(from)); } else { - *static_cast *>(to) = std::make_pair(std::cref(any_cast(from)->first), std::reference_wrapper{any_cast(from)->second}); + *static_cast *>(to) = std::make_pair(std::cref(any_cast(from)->first), std::ref(any_cast(from)->second)); } break; }