diff options
Diffstat (limited to 'src/mongo/db/repl/master_slave.cpp')
| -rw-r--r-- | src/mongo/db/repl/master_slave.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/db/repl/master_slave.cpp b/src/mongo/db/repl/master_slave.cpp index 2f269b625c5..8bd5ee04cce 100644 --- a/src/mongo/db/repl/master_slave.cpp +++ b/src/mongo/db/repl/master_slave.cpp @@ -43,7 +43,6 @@ #include "mongo/db/repl/master_slave.h" #include <pcrecpp.h> -#include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/thread/thread.hpp> @@ -73,7 +72,7 @@ #include "mongo/util/exit.h" #include "mongo/util/log.h" -using boost::scoped_ptr; +using std::unique_ptr; using std::unique_ptr; using std::cout; using std::endl; @@ -738,7 +737,7 @@ namespace repl { } } - scoped_ptr<Lock::GlobalWrite> lk(alreadyLocked ? 0 : new Lock::GlobalWrite(txn->lockState())); + unique_ptr<Lock::GlobalWrite> lk(alreadyLocked ? 0 : new Lock::GlobalWrite(txn->lockState())); if ( replAllDead ) { // hmmm why is this check here and not at top of this function? does it get set between top and here? @@ -1051,7 +1050,7 @@ namespace repl { int b = replApplyBatchSize.get(); bool justOne = b == 1; - scoped_ptr<Lock::GlobalWrite> lk(justOne ? 0 : new Lock::GlobalWrite(txn->lockState())); + unique_ptr<Lock::GlobalWrite> lk(justOne ? 0 : new Lock::GlobalWrite(txn->lockState())); while( 1 ) { BSONElement ts = op.getField("ts"); |