SERVER-17310 Make mongo::mutex a typedef of boost::mutex and remove mongo::scoped_lock.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/mongo/shell/shell_utils.cpp b/src/mongo/shell/shell_utils.cpp
index ee489a75dd4..77cf1103f1d 100644
--- a/src/mongo/shell/shell_utils.cpp
+++ b/src/mongo/shell/shell_utils.cpp
@@ -286,22 +286,20 @@ namespace mongo {
             return _confirmed = matchedY;
         }
 
-        ConnectionRegistry::ConnectionRegistry() :
-            _mutex( "connectionRegistryMutex" ) {
-        }
-        
+        ConnectionRegistry::ConnectionRegistry() = default;
+
         void ConnectionRegistry::registerConnection( DBClientWithCommands &client ) {
             BSONObj info;
             if ( client.runCommand( "admin", BSON( "whatsmyuri" << 1 ), info ) ) {
                 string connstr = dynamic_cast<DBClientBase&>( client ).getServerAddress();
-                mongo::mutex::scoped_lock lk( _mutex );
+                boost::lock_guard<boost::mutex> lk( _mutex );
                 _connectionUris[ connstr ].insert( info[ "you" ].str() );
             }            
         }
 
         void ConnectionRegistry::killOperationsOnAllConnections( bool withPrompt ) const {
             Prompter prompter( "do you want to kill the current op(s) on the server?" );
-            mongo::mutex::scoped_lock lk( _mutex );
+            boost::lock_guard<boost::mutex> lk( _mutex );
             for( map<string,set<string> >::const_iterator i = _connectionUris.begin();
                 i != _connectionUris.end(); ++i ) {
                 string errmsg;