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/dbtests/query_stage_collscan.cpp | |
| 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/dbtests/query_stage_collscan.cpp')
| -rw-r--r-- | src/mongo/dbtests/query_stage_collscan.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp index ffb204c2623..b190e852df8 100644 --- a/src/mongo/dbtests/query_stage_collscan.cpp +++ b/src/mongo/dbtests/query_stage_collscan.cpp @@ -30,7 +30,6 @@ * This file tests db/exec/collection_scan.cpp. */ -#include <boost/scoped_ptr.hpp> #include "mongo/client/dbclientcursor.h" #include "mongo/db/catalog/collection.h" @@ -49,7 +48,7 @@ namespace QueryStageCollectionScan { - using boost::scoped_ptr; + using std::unique_ptr; using std::unique_ptr; using std::vector; @@ -100,7 +99,7 @@ namespace QueryStageCollectionScan { Status status = PlanExecutor::make(&_txn, ws, ps, params.collection, PlanExecutor::YIELD_MANUAL, &rawExec); ASSERT_OK(status); - boost::scoped_ptr<PlanExecutor> exec(rawExec); + std::unique_ptr<PlanExecutor> exec(rawExec); // Use the runner to count the number of objects scanned. int count = 0; @@ -118,7 +117,7 @@ namespace QueryStageCollectionScan { params.direction = direction; params.tailable = false; - scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); + unique_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); while (!scan->isEOF()) { WorkingSetID id = WorkingSet::INVALID_ID; PlanStage::StageState state = scan->work(&id); @@ -210,7 +209,7 @@ namespace QueryStageCollectionScan { Status status = PlanExecutor::make(&_txn, ws, ps, params.collection, PlanExecutor::YIELD_MANUAL, &rawExec); ASSERT_OK(status); - boost::scoped_ptr<PlanExecutor> exec(rawExec); + std::unique_ptr<PlanExecutor> exec(rawExec); int count = 0; for (BSONObj obj; PlanExecutor::ADVANCED == exec->getNext(&obj, NULL); ) { @@ -244,7 +243,7 @@ namespace QueryStageCollectionScan { Status status = PlanExecutor::make(&_txn, ws, ps, params.collection, PlanExecutor::YIELD_MANUAL, &rawExec); ASSERT_OK(status); - boost::scoped_ptr<PlanExecutor> exec(rawExec); + std::unique_ptr<PlanExecutor> exec(rawExec); int count = 0; for (BSONObj obj; PlanExecutor::ADVANCED == exec->getNext(&obj, NULL); ) { @@ -279,7 +278,7 @@ namespace QueryStageCollectionScan { params.tailable = false; WorkingSet ws; - scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); + unique_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); int count = 0; while (count < 10) { @@ -340,7 +339,7 @@ namespace QueryStageCollectionScan { params.tailable = false; WorkingSet ws; - scoped_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); + unique_ptr<CollectionScan> scan(new CollectionScan(&_txn, params, &ws, NULL)); int count = 0; while (count < 10) { |