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/and_sorted.cpp | |
parent | c9548e729c8fecd9d7a9a5dd341da0433194ac73 (diff) | |
download | mongo-c36f9ecb91e49da7e637863889804fc4e6c6c05e.tar.gz |
SERVER-39339 Remove `stdx/memory.h`
Diffstat (limited to 'src/mongo/db/exec/and_sorted.cpp')
-rw-r--r-- | src/mongo/db/exec/and_sorted.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mongo/db/exec/and_sorted.cpp b/src/mongo/db/exec/and_sorted.cpp index cdb095ba08d..f7fcdc170e2 100644 --- a/src/mongo/db/exec/and_sorted.cpp +++ b/src/mongo/db/exec/and_sorted.cpp @@ -29,10 +29,11 @@ #include "mongo/db/exec/and_sorted.h" +#include <memory> + #include "mongo/db/exec/and_common.h" #include "mongo/db/exec/scoped_timer.h" #include "mongo/db/exec/working_set_common.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { @@ -40,7 +41,6 @@ namespace mongo { using std::unique_ptr; using std::numeric_limits; using std::vector; -using stdx::make_unique; // static const char* AndSortedStage::kStageType = "AND_SORTED"; @@ -228,8 +228,9 @@ PlanStage::StageState AndSortedStage::moveTowardTargetRecordId(WorkingSetID* out unique_ptr<PlanStageStats> AndSortedStage::getStats() { _commonStats.isEOF = isEOF(); - unique_ptr<PlanStageStats> ret = make_unique<PlanStageStats>(_commonStats, STAGE_AND_SORTED); - ret->specific = make_unique<AndSortedStats>(_specificStats); + unique_ptr<PlanStageStats> ret = + std::make_unique<PlanStageStats>(_commonStats, STAGE_AND_SORTED); + ret->specific = std::make_unique<AndSortedStats>(_specificStats); for (size_t i = 0; i < _children.size(); ++i) { ret->children.emplace_back(_children[i]->getStats()); } |