Use std::move

2 files changed, 6 insertions, 5 deletions

diff --git a/vdslib/src/vespa/vdslib/distribution/distribution.cpp b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
index 00794242450..46b85b87c5d 100644
--- a/vdslib/src/vespa/vdslib/distribution/distribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/distribution.cpp
@@ -669,7 +669,7 @@ Distribution::splitNodesIntoLeafGroups(IndexList nodeList) const
 {
     std::vector<IndexList> result;
     std::map<uint16_t, IndexList> nodes;
-    for (uint16_t node : nodeList) {
+    for (auto node : nodeList) {
         const Group* group(_nodeGraph->getGroupForNode(node));
         if (group == nullptr) {
             LOGBP(warning, "Node %u is not assigned to a group. "
@@ -679,8 +679,9 @@ Distribution::splitNodesIntoLeafGroups(IndexList nodeList) const
             nodes[group->getIndex()].push_back(node);
         }
     }
-    for (const auto & node : nodes) {
-        result.push_back(node.second);
+    result.reserve(nodes.size());
+    for (auto & node : nodes) {
+        result.emplace_back(std::move(node.second));
     }
     return result;
 }
diff --git a/vdslib/src/vespa/vdslib/distribution/group.cpp b/vdslib/src/vespa/vdslib/distribution/group.cpp
index 308b9c77d94..e9b5023bfcb 100644
--- a/vdslib/src/vespa/vdslib/distribution/group.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/group.cpp
@@ -144,8 +144,8 @@ Group::setNodes(const std::vector<uint16_t>& nodes)
 const Group*
 Group::getGroupForNode(uint16_t nodeIdx) const
 {
-    for (uint32_t i = 0; i < _nodes.size(); ++i) {
-        if (_nodes[i] == nodeIdx) {
+    for (auto node : _nodes) {
+        if (node == nodeIdx) {
             return this;
         }
     }