SERVER-39339 Remove `stdx/memory.h`

5 files changed, 16 insertions, 14 deletions

diff --git a/src/mongo/rpc/factory.cpp b/src/mongo/rpc/factory.cpp
index 50459f68e2a..e7d7c2ec67b 100644
--- a/src/mongo/rpc/factory.cpp
+++ b/src/mongo/rpc/factory.cpp
@@ -31,6 +31,8 @@
 
 #include "mongo/rpc/factory.h"
 
+#include <memory>
+
 #include "mongo/rpc/legacy_reply.h"
 #include "mongo/rpc/legacy_reply_builder.h"
 #include "mongo/rpc/legacy_request.h"
@@ -38,7 +40,6 @@
 #include "mongo/rpc/message.h"
 #include "mongo/rpc/op_msg_rpc_impls.h"
 #include "mongo/rpc/protocol.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
@@ -58,9 +59,9 @@ Message messageFromOpMsgRequest(Protocol proto, const OpMsgRequest& request) {
 std::unique_ptr<ReplyInterface> makeReply(const Message* unownedMessage) {
     switch (unownedMessage->operation()) {
         case mongo::dbMsg:
-            return stdx::make_unique<OpMsgReply>(OpMsg::parseOwned(*unownedMessage));
+            return std::make_unique<OpMsgReply>(OpMsg::parseOwned(*unownedMessage));
         case mongo::opReply:
-            return stdx::make_unique<LegacyReply>(unownedMessage);
+            return std::make_unique<LegacyReply>(unownedMessage);
         default:
             uasserted(ErrorCodes::UnsupportedFormat,
                       str::stream() << "Received a reply message with unexpected opcode: "
@@ -84,9 +85,9 @@ OpMsgRequest opMsgRequestFromAnyProtocol(const Message& unownedMessage) {
 std::unique_ptr<ReplyBuilderInterface> makeReplyBuilder(Protocol protocol) {
     switch (protocol) {
         case Protocol::kOpMsg:
-            return stdx::make_unique<OpMsgReplyBuilder>();
+            return std::make_unique<OpMsgReplyBuilder>();
         case Protocol::kOpQuery:
-            return stdx::make_unique<LegacyReplyBuilder>();
+            return std::make_unique<LegacyReplyBuilder>();
     }
     MONGO_UNREACHABLE;
 }
diff --git a/src/mongo/rpc/legacy_reply_builder.cpp b/src/mongo/rpc/legacy_reply_builder.cpp
index 9fc8ad65a8b..ca4e2d0e08a 100644
--- a/src/mongo/rpc/legacy_reply_builder.cpp
+++ b/src/mongo/rpc/legacy_reply_builder.cpp
@@ -32,13 +32,13 @@
 #include "mongo/rpc/legacy_reply_builder.h"
 
 #include <iterator>
+#include <memory>
 
 #include "mongo/db/dbmessage.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/rpc/metadata.h"
 #include "mongo/rpc/metadata/sharding_metadata.h"
 #include "mongo/s/stale_exception.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
diff --git a/src/mongo/rpc/legacy_request_builder.cpp b/src/mongo/rpc/legacy_request_builder.cpp
index 07031bfe381..1a52bec654d 100644
--- a/src/mongo/rpc/legacy_request_builder.cpp
+++ b/src/mongo/rpc/legacy_request_builder.cpp
@@ -31,6 +31,7 @@
 
 #include "mongo/rpc/legacy_request_builder.h"
 
+#include <memory>
 #include <tuple>
 #include <utility>
 
@@ -39,7 +40,6 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/rpc/message.h"
 #include "mongo/rpc/metadata.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/util/assert_util.h"
 
 namespace mongo {
diff --git a/src/mongo/rpc/metadata/client_metadata_ismaster.cpp b/src/mongo/rpc/metadata/client_metadata_ismaster.cpp
index d095fa6ed1d..15a3dc7482d 100644
--- a/src/mongo/rpc/metadata/client_metadata_ismaster.cpp
+++ b/src/mongo/rpc/metadata/client_metadata_ismaster.cpp
@@ -31,6 +31,7 @@
 
 #include "mongo/rpc/metadata/client_metadata_ismaster.h"
 
+#include <memory>
 #include <string>
 
 #include "mongo/base/init.h"
@@ -38,7 +39,6 @@
 #include "mongo/db/client.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
-#include "mongo/stdx/memory.h"
 
 namespace mongo {
 
diff --git a/src/mongo/rpc/metadata/egress_metadata_hook_list_test.cpp b/src/mongo/rpc/metadata/egress_metadata_hook_list_test.cpp
index f2a70e15b40..65b9e742758 100644
--- a/src/mongo/rpc/metadata/egress_metadata_hook_list_test.cpp
+++ b/src/mongo/rpc/metadata/egress_metadata_hook_list_test.cpp
@@ -29,10 +29,11 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+
 #include "mongo/base/status.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/rpc/metadata/egress_metadata_hook_list.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/net/hostandport.h"
 
@@ -99,7 +100,7 @@ TEST(EgressMetadataHookListTest, EmptyHookShouldNotFail) {
 
 TEST(EgressMetadataHookListTest, SingleHook) {
     ReadReplyArgs hook1Args;
-    auto hook1 = stdx::make_unique<TestHook>("h1", &hook1Args);
+    auto hook1 = std::make_unique<TestHook>("h1", &hook1Args);
     EgressMetadataHookList hookList;
     hookList.addHook(std::move(hook1));
 
@@ -118,12 +119,12 @@ TEST(EgressMetadataHookListTest, SingleHook) {
 
 TEST(EgressMetadataHookListTest, MultipleHooks) {
     ReadReplyArgs hook1Args;
-    auto hook1 = stdx::make_unique<TestHook>("foo", &hook1Args);
+    auto hook1 = std::make_unique<TestHook>("foo", &hook1Args);
     EgressMetadataHookList hookList;
     hookList.addHook(std::move(hook1));
 
     ReadReplyArgs hook2Args;
-    auto hook2 = stdx::make_unique<TestHook>("bar", &hook2Args);
+    auto hook2 = std::make_unique<TestHook>("bar", &hook2Args);
     hookList.addHook(std::move(hook2));
 
     BSONObjBuilder builder;
@@ -147,12 +148,12 @@ TEST(EgressMetadataHookListTest, MultipleHooks) {
 
 TEST(EgressMetadataHookListTest, SingleBadHookShouldReturnError) {
     ReadReplyArgs hook1Args;
-    auto hook1 = stdx::make_unique<TestHook>("foo", &hook1Args);
+    auto hook1 = std::make_unique<TestHook>("foo", &hook1Args);
     EgressMetadataHookList hookList;
     hookList.addHook(std::move(hook1));
 
     Status err{ErrorCodes::IllegalOperation, "intentional error by test"};
-    auto hook2 = stdx::make_unique<FixedStatusTestHook>(err);
+    auto hook2 = std::make_unique<FixedStatusTestHook>(err);
     hookList.addHook(std::move(hook2));
 
     BSONObjBuilder builder;