Răsfoiți Sursa

meta: avoid unnecessary calls to std::move

Michele Caini 3 ani în urmă
părinte
comite
30772848e6
2 a modificat fișierele cu 7 adăugiri și 7 ștergeri
  1. 4 4
      src/entt/meta/factory.hpp
  2. 3 3
      src/entt/meta/meta.hpp

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

@@ -36,19 +36,19 @@ namespace internal {
 }
 }
 
 
 inline meta_base_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_base_node node) {
 inline meta_base_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_base_node node) {
-    return parent.details->base.insert_or_assign(id, std::move(node)).first->second;
+    return parent.details->base.insert_or_assign(id, node).first->second;
 }
 }
 
 
 inline meta_conv_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_conv_node node) {
 inline meta_conv_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_conv_node node) {
-    return parent.details->conv.insert_or_assign(id, std::move(node)).first->second;
+    return parent.details->conv.insert_or_assign(id, node).first->second;
 }
 }
 
 
 inline meta_ctor_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_ctor_node node) {
 inline meta_ctor_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_ctor_node node) {
-    return parent.details->ctor.insert_or_assign(id, std::move(node)).first->second;
+    return parent.details->ctor.insert_or_assign(id, node).first->second;
 }
 }
 
 
 inline meta_dtor_node &meta_extend(internal::meta_type_node &parent, meta_dtor_node node) {
 inline meta_dtor_node &meta_extend(internal::meta_type_node &parent, meta_dtor_node node) {
-    return (parent.dtor = std::move(node));
+    return (parent.dtor = node);
 }
 }
 
 
 inline meta_data_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_data_node node) {
 inline meta_data_node &meta_extend(internal::meta_type_node &parent, const id_type id, meta_data_node node) {

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

@@ -1634,7 +1634,7 @@ public:
     explicit meta_iterator(const meta_ctx &area, It iter) noexcept
     explicit meta_iterator(const meta_ctx &area, It iter) noexcept
         : ctx{&area},
         : ctx{&area},
           vtable{&basic_vtable<It>},
           vtable{&basic_vtable<It>},
-          handle{std::move(iter)} {}
+          handle{iter} {}
 
 
     meta_iterator &operator++() noexcept {
     meta_iterator &operator++() noexcept {
         vtable(operation::incr, handle, 1, nullptr);
         vtable(operation::incr, handle, 1, nullptr);
@@ -1728,7 +1728,7 @@ public:
     meta_iterator(const meta_ctx &area, std::integral_constant<bool, KeyOnly>, It iter) noexcept
     meta_iterator(const meta_ctx &area, std::integral_constant<bool, KeyOnly>, It iter) noexcept
         : ctx{&area},
         : ctx{&area},
           vtable{&basic_vtable<KeyOnly, It>},
           vtable{&basic_vtable<KeyOnly, It>},
-          handle{std::move(iter)} {}
+          handle{iter} {}
 
 
     meta_iterator &operator++() noexcept {
     meta_iterator &operator++() noexcept {
         vtable(operation::incr, handle, nullptr);
         vtable(operation::incr, handle, nullptr);
@@ -1838,7 +1838,7 @@ inline meta_sequence_container::iterator meta_sequence_container::insert(iterato
  * @return A possibly invalid iterator following the last removed element.
  * @return A possibly invalid iterator following the last removed element.
  */
  */
 inline meta_sequence_container::iterator meta_sequence_container::erase(iterator it) {
 inline meta_sequence_container::iterator meta_sequence_container::erase(iterator it) {
-    return insert(std::move(it), {});
+    return insert(it, {});
 }
 }
 
 
 /**
 /**