SERVER-17308 Replace boost::scoped_ptr<T> with std::unique_ptr<T>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/mongo/db/commands/plan_cache_commands_test.cpp b/src/mongo/db/commands/plan_cache_commands_test.cpp
index 69a9c461a76..abdc2f53a94 100644
--- a/src/mongo/db/commands/plan_cache_commands_test.cpp
+++ b/src/mongo/db/commands/plan_cache_commands_test.cpp
@@ -33,7 +33,6 @@
 #include "mongo/db/commands/plan_cache_commands.h"
 
 #include <algorithm>
-#include <boost/scoped_ptr.hpp>
 
 #include "mongo/db/json.h"
 #include "mongo/db/operation_context_noop.h"
@@ -46,7 +45,7 @@ using namespace mongo;
 
 namespace {
 
-    using boost::scoped_ptr;
+    using std::unique_ptr;
     using std::unique_ptr;
     using std::string;
     using std::vector;
@@ -196,36 +195,36 @@ namespace {
 
         // Valid parameters
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns, fromjson("{query: {a: 1, b: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> query(cqRaw);
+        unique_ptr<CanonicalQuery> query(cqRaw);
 
 
         // Equivalent query should generate same key.
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns, fromjson("{query: {b: 1, a: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> equivQuery(cqRaw);
+        unique_ptr<CanonicalQuery> equivQuery(cqRaw);
         ASSERT_EQUALS(planCache.computeKey(*query), planCache.computeKey(*equivQuery));
 
         // Sort query should generate different key from unsorted query.
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns,
             fromjson("{query: {a: 1, b: 1}, sort: {a: 1, b: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> sortQuery1(cqRaw);
+        unique_ptr<CanonicalQuery> sortQuery1(cqRaw);
         ASSERT_NOT_EQUALS(planCache.computeKey(*query), planCache.computeKey(*sortQuery1));
 
         // Confirm sort arguments are properly delimited (SERVER-17158)
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns,
             fromjson("{query: {a: 1, b: 1}, sort: {aab: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> sortQuery2(cqRaw);
+        unique_ptr<CanonicalQuery> sortQuery2(cqRaw);
         ASSERT_NOT_EQUALS(planCache.computeKey(*sortQuery1), planCache.computeKey(*sortQuery2));
 
         // Changing order and/or value of predicates should not change key
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns,
             fromjson("{query: {b: 3, a: 3}, sort: {a: 1, b: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> sortQuery3(cqRaw);
+        unique_ptr<CanonicalQuery> sortQuery3(cqRaw);
         ASSERT_EQUALS(planCache.computeKey(*sortQuery1), planCache.computeKey(*sortQuery3));
 
         // Projected query should generate different key from unprojected query.
         ASSERT_OK(PlanCacheCommand::canonicalize(&txn, ns,
             fromjson("{query: {a: 1, b: 1}, projection: {_id: 0, a: 1}}"), &cqRaw));
-        scoped_ptr<CanonicalQuery> projectionQuery(cqRaw);
+        unique_ptr<CanonicalQuery> projectionQuery(cqRaw);
         ASSERT_NOT_EQUALS(planCache.computeKey(*query), planCache.computeKey(*projectionQuery));
     }