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

3 files changed, 5 insertions, 6 deletions

diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp
index b0ecb34c0bb..151c0a6ed3b 100644
--- a/src/mongo/shell/bench.cpp
+++ b/src/mongo/shell/bench.cpp
@@ -738,7 +738,7 @@ namespace mongo {
     void BenchRunWorker::run() {
         try {
             BenchRunWorkerStateGuard _workerStateGuard( _brState );
-            boost::scoped_ptr<DBClientBase> conn( _config->createConnection() );
+            std::unique_ptr<DBClientBase> conn( _config->createConnection() );
             if ( !_config->username.empty() ) {
                 string errmsg;
                 if (!conn->auth("admin", _config->username, _config->password, errmsg)) {
@@ -776,7 +776,7 @@ namespace mongo {
      void BenchRunner::start( ) {
 
          {
-             boost::scoped_ptr<DBClientBase> conn( _config->createConnection() );
+             std::unique_ptr<DBClientBase> conn( _config->createConnection() );
              // Must authenticate to admin db in order to run serverStatus command
              if (_config->username != "") {
                  string errmsg;
@@ -814,7 +814,7 @@ namespace mongo {
          delete _brTimer;
 
          {
-             boost::scoped_ptr<DBClientBase> conn( _config->createConnection() );
+             std::unique_ptr<DBClientBase> conn( _config->createConnection() );
              if (_config->username != "") {
                  string errmsg;
                  // this can only fail if admin access was revoked since start of run
diff --git a/src/mongo/shell/bench.h b/src/mongo/shell/bench.h
index 280d7c1399d..6edd007b6c6 100644
--- a/src/mongo/shell/bench.h
+++ b/src/mongo/shell/bench.h
@@ -30,7 +30,6 @@
 
 #include <string>
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/noncopyable.hpp>
@@ -434,7 +433,7 @@ namespace mongo {
         BenchRunState _brState;
         Timer *_brTimer;
         unsigned long long _microsElapsed;
-        boost::scoped_ptr<BenchRunConfig> _config;
+        std::unique_ptr<BenchRunConfig> _config;
         std::vector<BenchRunWorker *> _workers;
 
         BSONObj before;
diff --git a/src/mongo/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp
index cd7dd909264..ce951fc92d5 100644
--- a/src/mongo/shell/shell_utils.cpp
+++ b/src/mongo/shell/shell_utils.cpp
@@ -315,7 +315,7 @@ namespace mongo {
                 const ConnectionString cs(status.getValue());
 
                 string errmsg;
-                boost::scoped_ptr<DBClientWithCommands> conn( cs.connect( errmsg ) );
+                std::unique_ptr<DBClientWithCommands> conn( cs.connect( errmsg ) );
                 if ( !conn ) {
                     continue;
                 }