16 files changed, 34 insertions, 32 deletions
diff --git a/src/mongo/db/storage/biggie/biggie_kv_engine.cpp b/src/mongo/db/storage/biggie/biggie_kv_engine.cpp
index ad51f1ca25a..1ece635c229 100644
--- a/src/mongo/db/storage/biggie/biggie_kv_engine.cpp
+++ b/src/mongo/db/storage/biggie/biggie_kv_engine.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/index/index_descriptor.h"
 #include "mongo/db/snapshot_window_options.h"
 #include "mongo/db/storage/biggie/biggie_kv_engine.h"
diff --git a/src/mongo/db/storage/devnull/devnull_kv_engine.cpp b/src/mongo/db/storage/devnull/devnull_kv_engine.cpp
index a8f0fac6489..6ae745c5587 100644
--- a/src/mongo/db/storage/devnull/devnull_kv_engine.cpp
+++ b/src/mongo/db/storage/devnull/devnull_kv_engine.cpp
@@ -31,7 +31,6 @@
 
 #include "mongo/db/storage/devnull/devnull_kv_engine.h"
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/snapshot_window_options.h"
 #include "mongo/db/storage/ephemeral_for_test/ephemeral_for_test_record_store.h"
 #include "mongo/db/storage/record_store.h"
@@ -177,7 +176,8 @@ private:
 };
 
 class DevNullSortedDataBuilderInterface : public SortedDataBuilderInterface {
-    MONGO_DISALLOW_COPYING(DevNullSortedDataBuilderInterface);
+    DevNullSortedDataBuilderInterface(const DevNullSortedDataBuilderInterface&) = delete;
+    DevNullSortedDataBuilderInterface& operator=(const DevNullSortedDataBuilderInterface&) = delete;
 
 public:
     DevNullSortedDataBuilderInterface() {}
diff --git a/src/mongo/db/storage/encryption_hooks.h b/src/mongo/db/storage/encryption_hooks.h
index 68760531dea..f5a5db60923 100644
--- a/src/mongo/db/storage/encryption_hooks.h
+++ b/src/mongo/db/storage/encryption_hooks.h
@@ -33,7 +33,6 @@
 #include <string>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/jsobj.h"
 
 namespace boost {
diff --git a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.h b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.h
index dfd048ca67d..c249d9af0ba 100644
--- a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.h
+++ b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper.h
@@ -34,7 +34,6 @@
 #include <set>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/timestamp.h"
 #include "mongo/db/namespace_string.h"
@@ -58,7 +57,8 @@ namespace mongo {
  * dropldentsOlderThan() is provided for this purpose.
  */
 class KVDropPendingIdentReaper {
-    MONGO_DISALLOW_COPYING(KVDropPendingIdentReaper);
+    KVDropPendingIdentReaper(const KVDropPendingIdentReaper&) = delete;
+    KVDropPendingIdentReaper& operator=(const KVDropPendingIdentReaper&) = delete;
 
 public:
     explicit KVDropPendingIdentReaper(KVEngine* engine);
diff --git a/src/mongo/db/storage/mobile/mobile_session.h b/src/mongo/db/storage/mobile/mobile_session.h
index f4126fe605a..6e48caed880 100644
--- a/src/mongo/db/storage/mobile/mobile_session.h
+++ b/src/mongo/db/storage/mobile/mobile_session.h
@@ -32,7 +32,6 @@
 #include <sqlite3.h>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/storage/mobile/mobile_session_pool.h"
 
 namespace mongo {
@@ -42,7 +41,8 @@ class MobileSessionPool;
  * This class manages a SQLite database connection object.
  */
 class MobileSession final {
-    MONGO_DISALLOW_COPYING(MobileSession);
+    MobileSession(const MobileSession&) = delete;
+    MobileSession& operator=(const MobileSession&) = delete;
 
 public:
     MobileSession(sqlite3* session, MobileSessionPool* sessionPool);
diff --git a/src/mongo/db/storage/mobile/mobile_session_pool.h b/src/mongo/db/storage/mobile/mobile_session_pool.h
index 8db3d92ee92..90535091fd8 100644
--- a/src/mongo/db/storage/mobile/mobile_session_pool.h
+++ b/src/mongo/db/storage/mobile/mobile_session_pool.h
@@ -34,7 +34,6 @@
 #include <string>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/storage/mobile/mobile_session.h"
 #include "mongo/stdx/mutex.h"
@@ -46,7 +45,8 @@ class MobileSession;
  * This class manages a queue of operations delayed for some reason
  */
 class MobileDelayedOpQueue final {
-    MONGO_DISALLOW_COPYING(MobileDelayedOpQueue);
+    MobileDelayedOpQueue(const MobileDelayedOpQueue&) = delete;
+    MobileDelayedOpQueue& operator=(const MobileDelayedOpQueue&) = delete;
 
 public:
     MobileDelayedOpQueue();
@@ -65,7 +65,8 @@ private:
  * This class manages a pool of open sqlite3* objects.
  */
 class MobileSessionPool final {
-    MONGO_DISALLOW_COPYING(MobileSessionPool);
+    MobileSessionPool(const MobileSessionPool&) = delete;
+    MobileSessionPool& operator=(const MobileSessionPool&) = delete;
 
 public:
     MobileSessionPool(const std::string& path, std::uint64_t maxPoolSize = 80);
diff --git a/src/mongo/db/storage/record_store.h b/src/mongo/db/storage/record_store.h
index af9faa245d8..5389e8f6439 100644
--- a/src/mongo/db/storage/record_store.h
+++ b/src/mongo/db/storage/record_store.h
@@ -239,7 +239,8 @@ public:
  * for MMAPv1 is this class not thread-safe.
  */
 class RecordStore {
-    MONGO_DISALLOW_COPYING(RecordStore);
+    RecordStore(const RecordStore&) = delete;
+    RecordStore& operator=(const RecordStore&) = delete;
 
 public:
     RecordStore(StringData ns) : _ns(ns.toString()) {}
diff --git a/src/mongo/db/storage/recovery_unit.h b/src/mongo/db/storage/recovery_unit.h
index ce62e0ba29a..6403135fa12 100644
--- a/src/mongo/db/storage/recovery_unit.h
+++ b/src/mongo/db/storage/recovery_unit.h
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/bson/timestamp.h"
 #include "mongo/db/repl/read_concern_level.h"
@@ -50,7 +49,8 @@ class OperationContext;
  * and an operator to add the statistics values.
  */
 class StorageStats {
-    MONGO_DISALLOW_COPYING(StorageStats);
+    StorageStats(const StorageStats&) = delete;
+    StorageStats& operator=(const StorageStats&) = delete;
 
 public:
     StorageStats() = default;
@@ -80,7 +80,8 @@ public:
  * All on-disk information must be mutated through this interface.
  */
 class RecoveryUnit {
-    MONGO_DISALLOW_COPYING(RecoveryUnit);
+    RecoveryUnit(const RecoveryUnit&) = delete;
+    RecoveryUnit& operator=(const RecoveryUnit&) = delete;
 
 public:
     virtual ~RecoveryUnit() {}
diff --git a/src/mongo/db/storage/remove_saver.h b/src/mongo/db/storage/remove_saver.h
index d64604ad7a8..0704ddb4d49 100644
--- a/src/mongo/db/storage/remove_saver.h
+++ b/src/mongo/db/storage/remove_saver.h
@@ -34,7 +34,6 @@
 #include <ostream>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/storage/data_protector.h"
@@ -48,7 +47,8 @@ namespace mongo {
  * deletion, otherwise the document will be lost if the process gets terminated in between.
  */
 class RemoveSaver {
-    MONGO_DISALLOW_COPYING(RemoveSaver);
+    RemoveSaver(const RemoveSaver&) = delete;
+    RemoveSaver& operator=(const RemoveSaver&) = delete;
 
 public:
     RemoveSaver(const std::string& type, const std::string& ns, const std::string& why);
diff --git a/src/mongo/db/storage/storage_engine_lock_file.h b/src/mongo/db/storage/storage_engine_lock_file.h
index 983b3fa6ab8..14a576aab01 100644
--- a/src/mongo/db/storage/storage_engine_lock_file.h
+++ b/src/mongo/db/storage/storage_engine_lock_file.h
@@ -33,7 +33,6 @@
 #include <memory>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/db/service_context.h"
 
@@ -42,7 +41,8 @@ namespace mongo {
 constexpr StringData kLockFileBasename = "mongod.lock"_sd;
 
 class StorageEngineLockFile {
-    MONGO_DISALLOW_COPYING(StorageEngineLockFile);
+    StorageEngineLockFile(const StorageEngineLockFile&) = delete;
+    StorageEngineLockFile& operator=(const StorageEngineLockFile&) = delete;
 
 public:
     static boost::optional<StorageEngineLockFile>& get(ServiceContext* service);
diff --git a/src/mongo/db/storage/storage_engine_metadata.h b/src/mongo/db/storage/storage_engine_metadata.h
index 188d9365107..e38a6df46ab 100644
--- a/src/mongo/db/storage/storage_engine_metadata.h
+++ b/src/mongo/db/storage/storage_engine_metadata.h
@@ -34,7 +34,6 @@
 #include <memory>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/db/jsobj.h"
 
@@ -47,7 +46,8 @@ namespace mongo {
  * Fields other than 'storage.engine' are ignored.
  */
 class StorageEngineMetadata {
-    MONGO_DISALLOW_COPYING(StorageEngineMetadata);
+    StorageEngineMetadata(const StorageEngineMetadata&) = delete;
+    StorageEngineMetadata& operator=(const StorageEngineMetadata&) = delete;
 
 public:
     /**
diff --git a/src/mongo/db/storage/storage_repair_observer.h b/src/mongo/db/storage/storage_repair_observer.h
index bbb0852747f..6f5a89c4751 100644
--- a/src/mongo/db/storage/storage_repair_observer.h
+++ b/src/mongo/db/storage/storage_repair_observer.h
@@ -33,7 +33,6 @@
 
 #include <boost/filesystem.hpp>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/service_context.h"
 
 namespace mongo {
@@ -45,7 +44,8 @@ namespace mongo {
  * */
 class StorageRepairObserver {
 public:
-    MONGO_DISALLOW_COPYING(StorageRepairObserver);
+    StorageRepairObserver(const StorageRepairObserver&) = delete;
+    StorageRepairObserver& operator=(const StorageRepairObserver&) = delete;
 
     explicit StorageRepairObserver(const std::string& dbpath);
     ~StorageRepairObserver() = default;
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h
index e7066b09965..f71ba7e5214 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_record_store.h"
 #include "mongo/stdx/condition_variable.h"
 #include "mongo/stdx/mutex.h"
@@ -45,7 +44,8 @@ class WiredTigerSessionCache;
 // Manages oplog visibility, by periodically querying WiredTiger's all_committed timestamp value and
 // then using that timestamp for all transactions that read the oplog collection.
 class WiredTigerOplogManager {
-    MONGO_DISALLOW_COPYING(WiredTigerOplogManager);
+    WiredTigerOplogManager(const WiredTigerOplogManager&) = delete;
+    WiredTigerOplogManager& operator=(const WiredTigerOplogManager&) = delete;
 
 public:
     WiredTigerOplogManager() {}
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.h b/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.h
index 046256cff1f..9ff2b87497f 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_snapshot_manager.h
@@ -32,7 +32,6 @@
 #include <boost/optional.hpp>
 #include <wiredtiger.h>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/bson/timestamp.h"
 #include "mongo/db/storage/snapshot_manager.h"
 #include "mongo/db/storage/wiredtiger/wiredtiger_begin_transaction_block.h"
@@ -43,7 +42,8 @@ namespace mongo {
 class WiredTigerOplogManager;
 
 class WiredTigerSnapshotManager final : public SnapshotManager {
-    MONGO_DISALLOW_COPYING(WiredTigerSnapshotManager);
+    WiredTigerSnapshotManager(const WiredTigerSnapshotManager&) = delete;
+    WiredTigerSnapshotManager& operator=(const WiredTigerSnapshotManager&) = delete;
 
 public:
     WiredTigerSnapshotManager() = default;
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.h b/src/mongo/db/storage/wiredtiger/wiredtiger_util.h
index 3a7fb134b50..23015814cf7 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_util.h
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_util.h
@@ -32,7 +32,6 @@
 #include <limits>
 #include <wiredtiger.h>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
 #include "mongo/bson/bsonobj.h"
@@ -123,7 +122,8 @@ private:
 };
 
 class WiredTigerUtil {
-    MONGO_DISALLOW_COPYING(WiredTigerUtil);
+    WiredTigerUtil(const WiredTigerUtil&) = delete;
+    WiredTigerUtil& operator=(const WiredTigerUtil&) = delete;
 
 private:
     WiredTigerUtil();
@@ -287,7 +287,8 @@ private:
 };
 
 class WiredTigerConfigParser {
-    MONGO_DISALLOW_COPYING(WiredTigerConfigParser);
+    WiredTigerConfigParser(const WiredTigerConfigParser&) = delete;
+    WiredTigerConfigParser& operator=(const WiredTigerConfigParser&) = delete;
 
 public:
     WiredTigerConfigParser(StringData config) {
diff --git a/src/mongo/db/storage/write_unit_of_work.h b/src/mongo/db/storage/write_unit_of_work.h
index 3830aa37286..297d1f65f6e 100644
--- a/src/mongo/db/storage/write_unit_of_work.h
+++ b/src/mongo/db/storage/write_unit_of_work.h
@@ -31,7 +31,6 @@
 
 #include <memory>
 
-#include "mongo/base/disallow_copying.h"
 
 namespace mongo {
 
@@ -48,7 +47,8 @@ class OperationContext;
  * also abort.
  */
 class WriteUnitOfWork {
-    MONGO_DISALLOW_COPYING(WriteUnitOfWork);
+    WriteUnitOfWork(const WriteUnitOfWork&) = delete;
+    WriteUnitOfWork& operator=(const WriteUnitOfWork&) = delete;
 
 public:
     /**