diff options
Diffstat (limited to 'src/mongo/dbtests/mock')
-rw-r--r-- | src/mongo/dbtests/mock/mock_conn_registry.cpp | 2 | ||||
-rw-r--r-- | src/mongo/dbtests/mock/mock_remote_db_server.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/dbtests/mock/mock_conn_registry.cpp b/src/mongo/dbtests/mock/mock_conn_registry.cpp index 0717e8951aa..9faf584bb10 100644 --- a/src/mongo/dbtests/mock/mock_conn_registry.cpp +++ b/src/mongo/dbtests/mock/mock_conn_registry.cpp @@ -81,7 +81,7 @@ void MockConnRegistry::clear() { std::unique_ptr<MockDBClientConnection> MockConnRegistry::connect(const std::string& connStr) { stdx::lock_guard<stdx::mutex> sl(_registryMutex); fassert(16534, _registry.count(connStr) == 1); - return stdx::make_unique<MockDBClientConnection>(_registry[connStr], true); + return std::make_unique<MockDBClientConnection>(_registry[connStr], true); } MockConnRegistry::MockConnHook::MockConnHook(MockConnRegistry* registry) : _registry(registry) {} diff --git a/src/mongo/dbtests/mock/mock_remote_db_server.cpp b/src/mongo/dbtests/mock/mock_remote_db_server.cpp index 5b6a884ba8d..f1253cc7fd9 100644 --- a/src/mongo/dbtests/mock/mock_remote_db_server.cpp +++ b/src/mongo/dbtests/mock/mock_remote_db_server.cpp @@ -31,12 +31,12 @@ #include "mongo/dbtests/mock/mock_remote_db_server.h" +#include <memory> #include <tuple> #include "mongo/dbtests/mock/mock_dbclient_connection.h" #include "mongo/rpc/metadata.h" #include "mongo/rpc/op_msg_rpc_impls.h" -#include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" #include "mongo/util/net/socket_exception.h" #include "mongo/util/str.h" @@ -171,7 +171,7 @@ rpc::UniqueReply MockRemoteDBServer::runCommand(InstanceID id, const OpMsgReques // We need to construct a reply message - it will always be read through a view so it // doesn't matter whether we use OpMsgReplyBuilder or LegacyReplyBuilder auto message = rpc::OpMsgReplyBuilder{}.setCommandReply(reply).done(); - auto replyView = stdx::make_unique<rpc::OpMsgReply>(&message); + auto replyView = std::make_unique<rpc::OpMsgReply>(&message); return rpc::UniqueReply(std::move(message), std::move(replyView)); } |