Use explicit before move

2 files changed, 5 insertions, 3 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
index 7ad2dc15b0d..394e5f4fff4 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attributemanager.cpp
@@ -592,7 +592,8 @@ AttributeManager::asyncForAttribute(const vespalib::string &name, std::shared_pt
         return;
     }
     AttributeVector::SP attrsp = itr->second.getAttribute();
-    _attributeFieldWriter.execute(_attributeFieldWriter.getExecutorId(attrsp->getNamePrefix()),
+    vespalib::string attrName = attrsp->getNamePrefix();
+    _attributeFieldWriter.execute(_attributeFieldWriter.getExecutorId(attrName),
                                   [attr=std::move(attrsp), func=std::move(func)]() { (*func)(*attr); });
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
index 32231038691..8100333397c 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/filter_attribute_manager.cpp
@@ -205,9 +205,10 @@ FilterAttributeManager::asyncForAttribute(const vespalib::string &name, std::sha
     AttributeGuard::UP attr = _mgr->getAttribute(name);
     if (!attr) { return; }
     search::ISequencedTaskExecutor &attributeFieldWriter = getAttributeFieldWriter();
-    attributeFieldWriter.execute(attributeFieldWriter.getExecutorId((*attr)->getNamePrefix()),
+    vespalib::string attrName = (*attr)->getNamePrefix();
+    attributeFieldWriter.execute(attributeFieldWriter.getExecutorId(attrName),
                                   [attr=std::move(attr), func=std::move(func)]() mutable {
-                                      (*func)(dynamic_cast<const search::AttributeVector&>(*attr));
+                                      (*func)(dynamic_cast<const search::AttributeVector&>(**attr));
                                   });
 
 }