Explorar o código

meta: suppress a bunch of shadow warnings

Michele Caini %!s(int64=3) %!d(string=hai) anos
pai
achega
10be00b352
Modificáronse 3 ficheiros con 9 adicións e 9 borrados
  1. 5 5
      src/entt/meta/factory.hpp
  2. 3 3
      src/entt/meta/meta.hpp
  3. 1 1
      src/entt/meta/node.hpp

+ 5 - 5
src/entt/meta/factory.hpp

@@ -104,7 +104,7 @@ class meta_factory {
                 Setter::size,
                 &internal::resolve<std::remove_cv_t<std::remove_reference_t<data_type>>>,
                 &meta_arg<type_list<type_list_element_t<type_list_element_t<Index, args_type>::size != 1u, type_list_element_t<Index, args_type>>...>>,
-                +[](meta_handle instance, meta_any value, const meta_ctx &ctx) { return (meta_setter<Type, value_list_element_v<Index, Setter>>(*instance.operator->(), value.as_ref(), ctx) || ...); },
+                +[](meta_handle instance, meta_any value, const meta_ctx &area) { return (meta_setter<Type, value_list_element_v<Index, Setter>>(*instance.operator->(), value.as_ref(), area) || ...); },
                 &meta_getter<Type, Getter, Policy>});
 
         bucket = &elem.prop;
@@ -190,8 +190,8 @@ public:
             internal::owner(*info, *ctx),
             type_id<conv_type>().hash(),
             internal::meta_conv_node{
-                +[](const void *instance, const meta_ctx &ctx) {
-                    return forward_as_meta(std::invoke(Candidate, *static_cast<const Type *>(instance)), ctx);
+                +[](const void *instance, const meta_ctx &area) {
+                    return forward_as_meta(std::invoke(Candidate, *static_cast<const Type *>(instance)), area);
                 }});
 
         bucket = nullptr;
@@ -215,8 +215,8 @@ public:
             internal::owner(*info, *ctx),
             type_id<conv_type>().hash(),
             internal::meta_conv_node{
-                +[](const void *instance, const meta_ctx &ctx) {
-                    return forward_as_meta(static_cast<To>(*static_cast<const Type *>(instance)), ctx);
+                +[](const void *instance, const meta_ctx &area) {
+                    return forward_as_meta(static_cast<To>(*static_cast<const Type *>(instance)), area);
                 }});
 
         bucket = nullptr;

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

@@ -579,9 +579,9 @@ meta_any make_meta(Args &&...args) {
 template<typename Type>
 meta_any forward_as_meta(Type &&value, const meta_ctx &ctx = locator<meta_ctx>::value_or()) {
     // TODO it would be great if we had value and context construction support for meta_any
-    meta_any any{ctx};
-    any.emplace<Type &&>(std::forward<Type>(value));
-    return any;
+    meta_any elem{ctx};
+    elem.emplace<Type &&>(std::forward<Type>(value));
+    return elem;
 }
 
 /**

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

@@ -220,7 +220,7 @@ template<typename Type>
         node.templ = meta_template_node{
             meta_template_traits<Type>::args_type::size,
             &resolve<typename meta_template_traits<Type>::class_type>,
-            +[](const std::size_t index, const meta_context &context) noexcept { return meta_arg_node(typename meta_template_traits<Type>::args_type{}, index, context); }};
+            +[](const std::size_t index, const meta_context &area) noexcept { return meta_arg_node(typename meta_template_traits<Type>::args_type{}, index, area); }};
     }
 
     return node;