From c36f9ecb91e49da7e637863889804fc4e6c6c05e Mon Sep 17 00:00:00 2001
From: ADAM David Alan Martin <adam.martin@10gen.com>
Date: Mon, 10 Jun 2019 01:21:01 -0400
Subject: SERVER-39339 Remove `stdx/memory.h`

---
 src/mongo/db/ftdc/ftdc_server.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mongo/db/ftdc/ftdc_server.cpp')

diff --git a/src/mongo/db/ftdc/ftdc_server.cpp b/src/mongo/db/ftdc/ftdc_server.cpp
index 142ef262751..92c2ca4fe2a 100644
--- a/src/mongo/db/ftdc/ftdc_server.cpp
+++ b/src/mongo/db/ftdc/ftdc_server.cpp
@@ -34,6 +34,7 @@
 #include <boost/filesystem.hpp>
 #include <fstream>
 #include <memory>
+#include <memory>
 
 #include "mongo/base/status.h"
 #include "mongo/bson/bsonobjbuilder.h"
@@ -45,7 +46,6 @@
 #include "mongo/db/ftdc/ftdc_system_stats.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/service_context.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/util/synchronized_value.h"
 
 namespace mongo {
@@ -211,7 +211,7 @@ void startFTDC(boost::filesystem::path& path,
 
     ftdcDirectoryPathParameter = path;
 
-    auto controller = stdx::make_unique<FTDCController>(path, config);
+    auto controller = std::make_unique<FTDCController>(path, config);
 
     // Install periodic collectors
     // These are collected on the period interval in FTDCConfig.
@@ -225,7 +225,7 @@ void startFTDC(boost::filesystem::path& path,
     // migrations.
     // "timing" is filtered out because it triggers frequent schema changes.
     // TODO: do we need to enable "sharding" on MongoS?
-    controller->addPeriodicCollector(stdx::make_unique<FTDCSimpleInternalCommandCollector>(
+    controller->addPeriodicCollector(std::make_unique<FTDCSimpleInternalCommandCollector>(
         "serverStatus",
         "serverStatus",
         "",
@@ -241,15 +241,15 @@ void startFTDC(boost::filesystem::path& path,
     // These are collected on each file rotation.
 
     // CmdBuildInfo
-    controller->addOnRotateCollector(stdx::make_unique<FTDCSimpleInternalCommandCollector>(
+    controller->addOnRotateCollector(std::make_unique<FTDCSimpleInternalCommandCollector>(
         "buildInfo", "buildInfo", "", BSON("buildInfo" << 1)));
 
     // CmdGetCmdLineOpts
-    controller->addOnRotateCollector(stdx::make_unique<FTDCSimpleInternalCommandCollector>(
+    controller->addOnRotateCollector(std::make_unique<FTDCSimpleInternalCommandCollector>(
         "getCmdLineOpts", "getCmdLineOpts", "", BSON("getCmdLineOpts" << 1)));
 
     // HostInfoCmd
-    controller->addOnRotateCollector(stdx::make_unique<FTDCSimpleInternalCommandCollector>(
+    controller->addOnRotateCollector(std::make_unique<FTDCSimpleInternalCommandCollector>(
         "hostInfo", "hostInfo", "", BSON("hostInfo" << 1)));
 
     // Install the new controller
-- 
cgit v1.2.1