diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-06-10 18:08:48 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-06-10 22:37:49 -0400 |
commit | d7d1fdb75966c684e9a42150e6e9b69c4a10ee08 (patch) | |
tree | d28b0767cbd8c1a09535f1676152e7ac57e829ce /src/mongo/db/query/plan_executor.h | |
parent | a9b6612f5322f916298c19a6728817a1034c6aab (diff) | |
download | mongo-d7d1fdb75966c684e9a42150e6e9b69c4a10ee08.tar.gz |
SERVER-17308 Replace boost::scoped_ptr<T> with std::unique_ptr<T>
Diffstat (limited to 'src/mongo/db/query/plan_executor.h')
-rw-r--r-- | src/mongo/db/query/plan_executor.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mongo/db/query/plan_executor.h b/src/mongo/db/query/plan_executor.h index 69aa7ef8397..c3e6fdc94c7 100644 --- a/src/mongo/db/query/plan_executor.h +++ b/src/mongo/db/query/plan_executor.h @@ -29,7 +29,6 @@ #pragma once #include <boost/optional.hpp> -#include <boost/scoped_ptr.hpp> #include <queue> #include "mongo/base/status.h" @@ -422,13 +421,13 @@ namespace mongo { // the plan stages. The collection must not be destroyed while there are active plans. const Collection* _collection; - boost::scoped_ptr<CanonicalQuery> _cq; - boost::scoped_ptr<WorkingSet> _workingSet; - boost::scoped_ptr<QuerySolution> _qs; - boost::scoped_ptr<PlanStage> _root; + std::unique_ptr<CanonicalQuery> _cq; + std::unique_ptr<WorkingSet> _workingSet; + std::unique_ptr<QuerySolution> _qs; + std::unique_ptr<PlanStage> _root; // Deregisters this executor when it is destroyed. - boost::scoped_ptr<ScopedExecutorRegistration> _safety; + std::unique_ptr<ScopedExecutorRegistration> _safety; // What namespace are we operating over? std::string _ns; @@ -440,7 +439,7 @@ namespace mongo { // This is used to handle automatic yielding when allowed by the YieldPolicy. Never NULL. // TODO make this a non-pointer member. This requires some header shuffling so that this // file includes plan_yield_policy.h rather than the other way around. - const boost::scoped_ptr<PlanYieldPolicy> _yieldPolicy; + const std::unique_ptr<PlanYieldPolicy> _yieldPolicy; // A stash of results generated by this plan that the user of the PlanExecutor didn't want // to consume yet. We empty the queue before retrieving further results from the plan |