SERVER-35512 Use unique_ptr in QuerySolutionNode::children and clone()

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/s/chunk_manager.cpp b/src/mongo/s/chunk_manager.cpp
index 888ba644b52..c269d700f5e 100644
--- a/src/mongo/s/chunk_manager.cpp
+++ b/src/mongo/s/chunk_manager.cpp
@@ -654,7 +654,7 @@ IndexBounds ChunkManager::collapseQuerySolution(const QuerySolutionNode* node) {
 
     if (node->children.size() == 1) {
         // e.g. FETCH -> IXSCAN
-        return collapseQuerySolution(node->children.front());
+        return collapseQuerySolution(node->children.front().get());
     }
 
     // children.size() > 1, assert it's OR / SORT_MERGE.
@@ -671,20 +671,18 @@ IndexBounds ChunkManager::collapseQuerySolution(const QuerySolutionNode* node) {
 
     IndexBounds bounds;
 
-    for (std::vector<QuerySolutionNode*>::const_iterator it = node->children.begin();
-         it != node->children.end();
-         it++) {
+    for (auto it = node->children.begin(); it != node->children.end(); it++) {
         // The first branch under OR
         if (it == node->children.begin()) {
             invariant(bounds.size() == 0);
-            bounds = collapseQuerySolution(*it);
+            bounds = collapseQuerySolution(it->get());
             if (bounds.size() == 0) {  // Got unexpected node in query solution tree
                 return IndexBounds();
             }
             continue;
         }
 
-        IndexBounds childBounds = collapseQuerySolution(*it);
+        IndexBounds childBounds = collapseQuerySolution(it->get());
         if (childBounds.size() == 0) {
             // Got unexpected node in query solution tree
             return IndexBounds();