3 files changed, 5 insertions, 8 deletions
diff --git a/src/mongo/db/index/btree_access_method.h b/src/mongo/db/index/btree_access_method.h
index a19858ca2b4..4133b41b892 100644
--- a/src/mongo/db/index/btree_access_method.h
+++ b/src/mongo/db/index/btree_access_method.h
@@ -28,7 +28,6 @@
 
 #pragma once
 
-#include <boost/scoped_ptr.hpp>
 
 #include "mongo/base/status.h"
 #include "mongo/db/index/index_access_method.h"
@@ -52,7 +51,7 @@ namespace mongo {
         virtual void getKeys(const BSONObj& obj, BSONObjSet* keys) const;
 
         // Our keys differ for V0 and V1.
-        boost::scoped_ptr<BtreeKeyGenerator> _keyGenerator;
+        std::unique_ptr<BtreeKeyGenerator> _keyGenerator;
     };
 
 }  // namespace mongo
diff --git a/src/mongo/db/index/btree_key_generator_test.cpp b/src/mongo/db/index/btree_key_generator_test.cpp
index 9430171f38e..f01f6552f18 100644
--- a/src/mongo/db/index/btree_key_generator_test.cpp
+++ b/src/mongo/db/index/btree_key_generator_test.cpp
@@ -28,14 +28,13 @@
 
 #include "mongo/db/index/btree_key_generator.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <iostream>
 
 #include "mongo/db/json.h"
 #include "mongo/unittest/unittest.h"
 
 using namespace mongo;
-using boost::scoped_ptr;
+using std::unique_ptr;
 using std::cout;
 using std::endl;
 using std::vector;
@@ -87,7 +86,7 @@ namespace {
             fixed.push_back(BSONElement());
         }
 
-        scoped_ptr<BtreeKeyGenerator> keyGen(
+        unique_ptr<BtreeKeyGenerator> keyGen(
             new BtreeKeyGeneratorV1(fieldNames, fixed, sparse));
 
         //
diff --git a/src/mongo/db/index/haystack_access_method.cpp b/src/mongo/db/index/haystack_access_method.cpp
index 1d7d27f233c..263568af37a 100644
--- a/src/mongo/db/index/haystack_access_method.cpp
+++ b/src/mongo/db/index/haystack_access_method.cpp
@@ -32,7 +32,6 @@
 
 #include "mongo/db/index/haystack_access_method.h"
 
-#include <boost/scoped_ptr.hpp>
 
 #include "mongo/base/status.h"
 #include "mongo/db/geo/hash.h"
@@ -45,7 +44,7 @@
 
 namespace mongo {
 
-    using boost::scoped_ptr;
+    using std::unique_ptr;
 
     HaystackAccessMethod::HaystackAccessMethod(IndexCatalogEntry* btreeState, SortedDataInterface* btree)
         : IndexAccessMethod(btreeState, btree) {
@@ -104,7 +103,7 @@ namespace mongo {
                 unordered_set<RecordId, RecordId::Hasher> thisPass;
 
 
-                scoped_ptr<PlanExecutor> exec(InternalPlanner::indexScan(txn,  collection,
+                unique_ptr<PlanExecutor> exec(InternalPlanner::indexScan(txn,  collection,
                                                                      _descriptor, key, key, true));
                 PlanExecutor::ExecState state;
                 RecordId loc;