8 files changed, 18 insertions, 16 deletions
diff --git a/src/mongo/db/ftdc/block_compressor.h b/src/mongo/db/ftdc/block_compressor.h
index 3d1fb8da101..2b2173d09b7 100644
--- a/src/mongo/db/ftdc/block_compressor.h
+++ b/src/mongo/db/ftdc/block_compressor.h
@@ -33,7 +33,6 @@
 #include <vector>
 
 #include "mongo/base/data_range.h"
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status_with.h"
 
 namespace mongo {
@@ -42,7 +41,8 @@ namespace mongo {
  * Compesses and uncompresses a block of buffer using zlib.
  */
 class BlockCompressor {
-    MONGO_DISALLOW_COPYING(BlockCompressor);
+    BlockCompressor(const BlockCompressor&) = delete;
+    BlockCompressor& operator=(const BlockCompressor&) = delete;
 
 public:
     BlockCompressor() = default;
diff --git a/src/mongo/db/ftdc/collector.h b/src/mongo/db/ftdc/collector.h
index 2e56318d588..d422abfc1e8 100644
--- a/src/mongo/db/ftdc/collector.h
+++ b/src/mongo/db/ftdc/collector.h
@@ -33,7 +33,6 @@
 #include <tuple>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 
 namespace mongo {
 
@@ -49,7 +48,8 @@ class OperationContext;
  * Provides an interface to collect BSONObjs from system providers
  */
 class FTDCCollectorInterface {
-    MONGO_DISALLOW_COPYING(FTDCCollectorInterface);
+    FTDCCollectorInterface(const FTDCCollectorInterface&) = delete;
+    FTDCCollectorInterface& operator=(const FTDCCollectorInterface&) = delete;
 
 public:
     virtual ~FTDCCollectorInterface() = default;
@@ -79,7 +79,8 @@ protected:
  * Not Thread-Safe. Locking is owner's responsibility.
  */
 class FTDCCollectorCollection {
-    MONGO_DISALLOW_COPYING(FTDCCollectorCollection);
+    FTDCCollectorCollection(const FTDCCollectorCollection&) = delete;
+    FTDCCollectorCollection& operator=(const FTDCCollectorCollection&) = delete;
 
 public:
     FTDCCollectorCollection() = default;
diff --git a/src/mongo/db/ftdc/compressor.h b/src/mongo/db/ftdc/compressor.h
index 400f51f307c..6af25dc20c1 100644
--- a/src/mongo/db/ftdc/compressor.h
+++ b/src/mongo/db/ftdc/compressor.h
@@ -35,7 +35,6 @@
 #include <tuple>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status_with.h"
 #include "mongo/bson/util/builder.h"
 #include "mongo/db/ftdc/block_compressor.h"
@@ -61,7 +60,8 @@ namespace mongo {
  * across all documents in the series of documents.
  */
 class FTDCCompressor {
-    MONGO_DISALLOW_COPYING(FTDCCompressor);
+    FTDCCompressor(const FTDCCompressor&) = delete;
+    FTDCCompressor& operator=(const FTDCCompressor&) = delete;
 
 public:
     /**
diff --git a/src/mongo/db/ftdc/controller.h b/src/mongo/db/ftdc/controller.h
index fafc98cc531..26d76b28ad7 100644
--- a/src/mongo/db/ftdc/controller.h
+++ b/src/mongo/db/ftdc/controller.h
@@ -33,7 +33,6 @@
 #include <cstdint>
 #include <memory>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/ftdc/collector.h"
 #include "mongo/db/ftdc/config.h"
 #include "mongo/db/ftdc/file_manager.h"
@@ -53,7 +52,8 @@ class ServiceContext;
  * Exposes an methods to response to configuration changes in a thread-safe manner.
  */
 class FTDCController {
-    MONGO_DISALLOW_COPYING(FTDCController);
+    FTDCController(const FTDCController&) = delete;
+    FTDCController& operator=(const FTDCController&) = delete;
 
 public:
     FTDCController(const boost::filesystem::path path, FTDCConfig config)
diff --git a/src/mongo/db/ftdc/decompressor.h b/src/mongo/db/ftdc/decompressor.h
index f8b03aa30bf..7481cf2b4e9 100644
--- a/src/mongo/db/ftdc/decompressor.h
+++ b/src/mongo/db/ftdc/decompressor.h
@@ -32,7 +32,6 @@
 #include <vector>
 
 #include "mongo/base/data_range.h"
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status_with.h"
 #include "mongo/db/ftdc/block_compressor.h"
 #include "mongo/db/jsobj.h"
@@ -43,7 +42,8 @@ namespace mongo {
  * Inflates a compressed chunk of metrics into a list of BSON documents
  */
 class FTDCDecompressor {
-    MONGO_DISALLOW_COPYING(FTDCDecompressor);
+    FTDCDecompressor(const FTDCDecompressor&) = delete;
+    FTDCDecompressor& operator=(const FTDCDecompressor&) = delete;
 
 public:
     FTDCDecompressor() = default;
diff --git a/src/mongo/db/ftdc/file_manager.h b/src/mongo/db/ftdc/file_manager.h
index bf160c69870..ed9a586977e 100644
--- a/src/mongo/db/ftdc/file_manager.h
+++ b/src/mongo/db/ftdc/file_manager.h
@@ -34,7 +34,6 @@
 #include <tuple>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/ftdc/collector.h"
@@ -53,7 +52,8 @@ class Client;
  * Manages file rotation, and directory size management.
  */
 class FTDCFileManager {
-    MONGO_DISALLOW_COPYING(FTDCFileManager);
+    FTDCFileManager(const FTDCFileManager&) = delete;
+    FTDCFileManager& operator=(const FTDCFileManager&) = delete;
 
 public:
     ~FTDCFileManager();
diff --git a/src/mongo/db/ftdc/file_reader.h b/src/mongo/db/ftdc/file_reader.h
index b768fcb06ea..caa94bfdc82 100644
--- a/src/mongo/db/ftdc/file_reader.h
+++ b/src/mongo/db/ftdc/file_reader.h
@@ -35,7 +35,6 @@
 #include <stddef.h>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
 #include "mongo/db/ftdc/decompressor.h"
@@ -50,7 +49,8 @@ namespace mongo {
  * Does not recover interim files into archive files.
  */
 class FTDCFileReader {
-    MONGO_DISALLOW_COPYING(FTDCFileReader);
+    FTDCFileReader(const FTDCFileReader&) = delete;
+    FTDCFileReader& operator=(const FTDCFileReader&) = delete;
 
 public:
     FTDCFileReader() : _state(State::kNeedsDoc) {}
diff --git a/src/mongo/db/ftdc/file_writer.h b/src/mongo/db/ftdc/file_writer.h
index 5d958e69286..9a7a8fa5e7d 100644
--- a/src/mongo/db/ftdc/file_writer.h
+++ b/src/mongo/db/ftdc/file_writer.h
@@ -59,7 +59,8 @@ namespace mongo {
  * File rotation and cleanup is not handled by this class.
  */
 class FTDCFileWriter {
-    MONGO_DISALLOW_COPYING(FTDCFileWriter);
+    FTDCFileWriter(const FTDCFileWriter&) = delete;
+    FTDCFileWriter& operator=(const FTDCFileWriter&) = delete;
 
 public:
     FTDCFileWriter(const FTDCConfig* config) : _config(config), _compressor(_config) {}