summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests/query_stage_sort.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests/query_stage_sort.cpp')
-rw-r--r--src/mongo/dbtests/query_stage_sort.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/dbtests/query_stage_sort.cpp b/src/mongo/dbtests/query_stage_sort.cpp
index dc267b9a8b1..b9b34bda21f 100644
--- a/src/mongo/dbtests/query_stage_sort.cpp
+++ b/src/mongo/dbtests/query_stage_sort.cpp
@@ -46,7 +46,7 @@
namespace QueryStageSortTests {
- using std::auto_ptr;
+ using std::unique_ptr;
using std::set;
class QueryStageSortTestBase {
@@ -104,15 +104,15 @@ namespace QueryStageSortTests {
PlanExecutor* makePlanExecutorWithSortStage(Collection* coll) {
PlanExecutor* exec;
// Build the mock scan stage which feeds the data.
- std::auto_ptr<WorkingSet> ws(new WorkingSet());
- auto_ptr<QueuedDataStage> ms(new QueuedDataStage(ws.get()));
+ std::unique_ptr<WorkingSet> ws(new WorkingSet());
+ unique_ptr<QueuedDataStage> ms(new QueuedDataStage(ws.get()));
insertVarietyOfObjects(ms.get(), coll);
SortStageParams params;
params.collection = coll;
params.pattern = BSON("foo" << 1);
params.limit = limit();
- auto_ptr<SortStage> ss(new SortStage(params, ws.get(), ms.release()));
+ unique_ptr<SortStage> ss(new SortStage(params, ws.get(), ms.release()));
// The PlanExecutor will be automatically registered on construction due to the auto
// yield policy, so it can receive invalidations when we remove documents later.
@@ -308,7 +308,7 @@ namespace QueryStageSortTests {
set<RecordId> locs;
getLocs(&locs, coll);
- std::auto_ptr<PlanExecutor> exec(makePlanExecutorWithSortStage(coll));
+ std::unique_ptr<PlanExecutor> exec(makePlanExecutorWithSortStage(coll));
SortStage * ss = static_cast<SortStage*>(exec->getRootStage());
QueuedDataStage* ms = static_cast<QueuedDataStage*>(ss->getChildren()[0]);
@@ -415,7 +415,7 @@ namespace QueryStageSortTests {
set<RecordId> locs;
getLocs(&locs, coll);
- std::auto_ptr<PlanExecutor> exec(makePlanExecutorWithSortStage(coll));
+ std::unique_ptr<PlanExecutor> exec(makePlanExecutorWithSortStage(coll));
SortStage * ss = static_cast<SortStage*>(exec->getRootStage());
QueuedDataStage* ms = static_cast<QueuedDataStage*>(ss->getChildren()[0]);