summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2018-06-12 11:09:32 -0400
committerDavid Storch <david.storch@10gen.com>2018-06-12 11:52:02 -0400
commit1d89d2c88bcb39045701b87612b866ae2eb49378 (patch)
tree8225e73a6e9c75f3b8fcde9e0614eb638ed755a6 /src/mongo/db/exec
parent361ec85b0a73baac9033cf5fe646e1cb40dc8f26 (diff)
downloadmongo-1d89d2c88bcb39045701b87612b866ae2eb49378.tar.gz
SERVER-35455 Eliminate owned raw pointers from QueryPlannerAccess.
This fixes a previous version of this commit by adding std::move() where copy elision is not guaranteed.
Diffstat (limited to 'src/mongo/db/exec')
-rw-r--r--src/mongo/db/exec/subplan.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/exec/subplan.cpp b/src/mongo/db/exec/subplan.cpp
index 0ece253d30b..36526c713a7 100644
--- a/src/mongo/db/exec/subplan.cpp
+++ b/src/mongo/db/exec/subplan.cpp
@@ -326,7 +326,7 @@ Status SubplanStage::choosePlanForSubqueries(PlanYieldPolicy* yieldPolicy) {
// Use the cached index assignments to build solnRoot. Takes ownership of '_orExpression'.
std::unique_ptr<QuerySolutionNode> solnRoot(QueryPlannerAccess::buildIndexedDataAccess(
- *_query, _orExpression.release(), false, _plannerParams.indices, _plannerParams));
+ *_query, std::move(_orExpression), _plannerParams.indices, _plannerParams));
if (!solnRoot) {
mongoutils::str::stream ss;