diff options
Diffstat (limited to 'src/mongo/db/query/stage_builder.cpp')
-rw-r--r-- | src/mongo/db/query/stage_builder.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/query/stage_builder.cpp b/src/mongo/db/query/stage_builder.cpp index 012efb8a262..ac2295c4985 100644 --- a/src/mongo/db/query/stage_builder.cpp +++ b/src/mongo/db/query/stage_builder.cpp @@ -33,6 +33,8 @@ #include "mongo/db/query/stage_builder.h" +#include <memory> + #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/database.h" #include "mongo/db/catalog/index_catalog.h" @@ -58,13 +60,11 @@ #include "mongo/db/index/fts_access_method.h" #include "mongo/db/matcher/extensions_callback_real.h" #include "mongo/db/s/collection_sharding_state.h" -#include "mongo/stdx/memory.h" #include "mongo/util/log.h" namespace mongo { using std::unique_ptr; -using stdx::make_unique; PlanStage* buildStages(OperationContext* opCtx, const Collection* collection, @@ -192,7 +192,7 @@ PlanStage* buildStages(OperationContext* opCtx, } case STAGE_AND_HASH: { const AndHashNode* ahn = static_cast<const AndHashNode*>(root); - auto ret = make_unique<AndHashStage>(opCtx, ws); + auto ret = std::make_unique<AndHashStage>(opCtx, ws); for (size_t i = 0; i < ahn->children.size(); ++i) { PlanStage* childStage = buildStages(opCtx, collection, cq, qsol, ahn->children[i], ws); @@ -205,7 +205,7 @@ PlanStage* buildStages(OperationContext* opCtx, } case STAGE_OR: { const OrNode* orn = static_cast<const OrNode*>(root); - auto ret = make_unique<OrStage>(opCtx, ws, orn->dedup, orn->filter.get()); + auto ret = std::make_unique<OrStage>(opCtx, ws, orn->dedup, orn->filter.get()); for (size_t i = 0; i < orn->children.size(); ++i) { PlanStage* childStage = buildStages(opCtx, collection, cq, qsol, orn->children[i], ws); @@ -218,7 +218,7 @@ PlanStage* buildStages(OperationContext* opCtx, } case STAGE_AND_SORTED: { const AndSortedNode* asn = static_cast<const AndSortedNode*>(root); - auto ret = make_unique<AndSortedStage>(opCtx, ws); + auto ret = std::make_unique<AndSortedStage>(opCtx, ws); for (size_t i = 0; i < asn->children.size(); ++i) { PlanStage* childStage = buildStages(opCtx, collection, cq, qsol, asn->children[i], ws); @@ -235,7 +235,7 @@ PlanStage* buildStages(OperationContext* opCtx, params.dedup = msn->dedup; params.pattern = msn->sort; params.collator = cq.getCollator(); - auto ret = make_unique<MergeSortStage>(opCtx, params, ws); + auto ret = std::make_unique<MergeSortStage>(opCtx, params, ws); for (size_t i = 0; i < msn->children.size(); ++i) { PlanStage* childStage = buildStages(opCtx, collection, cq, qsol, msn->children[i], ws); |