diff options
author | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:21:01 -0400 |
---|---|---|
committer | ADAM David Alan Martin <adam.martin@10gen.com> | 2019-06-10 01:59:35 -0400 |
commit | c36f9ecb91e49da7e637863889804fc4e6c6c05e (patch) | |
tree | 64d8aadb6d29042d4f4e7366bc1457e4e0612383 /src/mongo/db/exec/multi_plan.cpp | |
parent | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff) | |
download | mongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz |
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/db/exec/multi_plan.cpp')
-rw-r--r-- | src/mongo/db/exec/multi_plan.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/multi_plan.cpp b/src/mongo/db/exec/multi_plan.cpp index 425a37087ff..af79d91af30 100644 --- a/src/mongo/db/exec/multi_plan.cpp +++ b/src/mongo/db/exec/multi_plan.cpp @@ -35,6 +35,7 @@ #include <algorithm> #include <math.h> +#include <memory> #include "mongo/base/owned_pointer_vector.h" #include "mongo/db/catalog/collection.h" @@ -46,7 +47,6 @@ #include "mongo/db/query/explain.h" #include "mongo/db/query/plan_cache.h" #include "mongo/db/query/plan_ranker.h" -#include "mongo/stdx/memory.h" #include "mongo/util/log.h" #include "mongo/util/str.h" @@ -56,7 +56,6 @@ using std::endl; using std::list; using std::unique_ptr; using std::vector; -using stdx::make_unique; // static const char* MultiPlanStage::kStageType = "MULTI_PLAN"; @@ -421,8 +420,9 @@ QuerySolution* MultiPlanStage::bestSolution() { unique_ptr<PlanStageStats> MultiPlanStage::getStats() { _commonStats.isEOF = isEOF(); - unique_ptr<PlanStageStats> ret = make_unique<PlanStageStats>(_commonStats, STAGE_MULTI_PLAN); - ret->specific = make_unique<MultiPlanStats>(_specificStats); + unique_ptr<PlanStageStats> ret = + std::make_unique<PlanStageStats>(_commonStats, STAGE_MULTI_PLAN); + ret->specific = std::make_unique<MultiPlanStats>(_specificStats); for (auto&& child : _children) { ret->children.emplace_back(child->getStats()); } |