diff options
Diffstat (limited to 'src/mongo/db/repl')
63 files changed, 135 insertions, 110 deletions
diff --git a/src/mongo/db/repl/abstract_async_component.h b/src/mongo/db/repl/abstract_async_component.h index b853efd87f8..8d5e784b591 100644 --- a/src/mongo/db/repl/abstract_async_component.h +++ b/src/mongo/db/repl/abstract_async_component.h @@ -34,7 +34,6 @@ #include <string> #include <type_traits> -#include "mongo/base/disallow_copying.h" #include "mongo/base/static_assert.h" #include "mongo/base/status.h" #include "mongo/executor/task_executor.h" @@ -53,7 +52,8 @@ namespace repl { * _getMutex()). */ class AbstractAsyncComponent { - MONGO_DISALLOW_COPYING(AbstractAsyncComponent); + AbstractAsyncComponent(const AbstractAsyncComponent&) = delete; + AbstractAsyncComponent& operator=(const AbstractAsyncComponent&) = delete; public: AbstractAsyncComponent(executor::TaskExecutor* executor, const std::string& componentName); diff --git a/src/mongo/db/repl/abstract_oplog_fetcher.h b/src/mongo/db/repl/abstract_oplog_fetcher.h index 1420a3ba77d..11d59fd82a8 100644 --- a/src/mongo/db/repl/abstract_oplog_fetcher.h +++ b/src/mongo/db/repl/abstract_oplog_fetcher.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/client/fetcher.h" #include "mongo/db/namespace_string.h" @@ -51,7 +50,8 @@ namespace repl { * fetcher. Subclasses also provide a callback to run on successful batches. */ class AbstractOplogFetcher : public AbstractAsyncComponent { - MONGO_DISALLOW_COPYING(AbstractOplogFetcher); + AbstractOplogFetcher(const AbstractOplogFetcher&) = delete; + AbstractOplogFetcher& operator=(const AbstractOplogFetcher&) = delete; public: /** diff --git a/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp b/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp index f6989555821..92d576daa20 100644 --- a/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp +++ b/src/mongo/db/repl/abstract_oplog_fetcher_test.cpp @@ -511,7 +511,8 @@ TEST_F(AbstractOplogFetcherTest, OplogFetcherTimesOutCorrectlyOnRetriedFindReque bool sharedCallbackStateDestroyed = false; class SharedCallbackState { - MONGO_DISALLOW_COPYING(SharedCallbackState); + SharedCallbackState(const SharedCallbackState&) = delete; + SharedCallbackState& operator=(const SharedCallbackState&) = delete; public: SharedCallbackState() {} diff --git a/src/mongo/db/repl/abstract_oplog_fetcher_test_fixture.h b/src/mongo/db/repl/abstract_oplog_fetcher_test_fixture.h index c4f9163778d..9d1ec170ec8 100644 --- a/src/mongo/db/repl/abstract_oplog_fetcher_test_fixture.h +++ b/src/mongo/db/repl/abstract_oplog_fetcher_test_fixture.h @@ -28,7 +28,6 @@ */ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/abstract_oplog_fetcher.h" #include "mongo/executor/thread_pool_task_executor_test_fixture.h" #include "mongo/unittest/unittest.h" @@ -40,7 +39,8 @@ namespace repl { * This class represents the state at shutdown of an abstract oplog fetcher. */ class ShutdownState { - MONGO_DISALLOW_COPYING(ShutdownState); + ShutdownState(const ShutdownState&) = delete; + ShutdownState& operator=(const ShutdownState&) = delete; public: ShutdownState(); diff --git a/src/mongo/db/repl/applier_helpers.h b/src/mongo/db/repl/applier_helpers.h index 627bbd7b8a0..94ceffe894d 100644 --- a/src/mongo/db/repl/applier_helpers.h +++ b/src/mongo/db/repl/applier_helpers.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/repl/multiapplier.h" #include "mongo/db/repl/sync_tail.h" @@ -61,7 +60,8 @@ public: * successfully. */ class ApplierHelpers::InsertGroup { - MONGO_DISALLOW_COPYING(InsertGroup); + InsertGroup(const InsertGroup&) = delete; + InsertGroup& operator=(const InsertGroup&) = delete; public: using ConstIterator = OperationPtrs::const_iterator; diff --git a/src/mongo/db/repl/bgsync.h b/src/mongo/db/repl/bgsync.h index 048190ee86a..7e64afae171 100644 --- a/src/mongo/db/repl/bgsync.h +++ b/src/mongo/db/repl/bgsync.h @@ -31,7 +31,6 @@ #include <memory> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/jsobj.h" #include "mongo/db/repl/data_replicator_external_state.h" @@ -62,7 +61,8 @@ class ReplicationProcess; class StorageInterface; class BackgroundSync { - MONGO_DISALLOW_COPYING(BackgroundSync); + BackgroundSync(const BackgroundSync&) = delete; + BackgroundSync& operator=(const BackgroundSync&) = delete; public: /** diff --git a/src/mongo/db/repl/check_quorum_for_config_change.cpp b/src/mongo/db/repl/check_quorum_for_config_change.cpp index e0caf330bcb..6beca6bb321 100644 --- a/src/mongo/db/repl/check_quorum_for_config_change.cpp +++ b/src/mongo/db/repl/check_quorum_for_config_change.cpp @@ -33,7 +33,6 @@ #include "mongo/db/repl/check_quorum_for_config_change.h" -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/db/repl/repl_set_config.h" #include "mongo/db/repl/repl_set_heartbeat_args_v1.h" diff --git a/src/mongo/db/repl/check_quorum_for_config_change.h b/src/mongo/db/repl/check_quorum_for_config_change.h index 1117d563d68..4a7cbcb219f 100644 --- a/src/mongo/db/repl/check_quorum_for_config_change.h +++ b/src/mongo/db/repl/check_quorum_for_config_change.h @@ -49,7 +49,8 @@ class ReplSetConfig; * result of the quorum check. */ class QuorumChecker : public ScatterGatherAlgorithm { - MONGO_DISALLOW_COPYING(QuorumChecker); + QuorumChecker(const QuorumChecker&) = delete; + QuorumChecker& operator=(const QuorumChecker&) = delete; public: /** diff --git a/src/mongo/db/repl/collection_bulk_loader_impl.h b/src/mongo/db/repl/collection_bulk_loader_impl.h index 880bcc2d768..5e03fcbda5d 100644 --- a/src/mongo/db/repl/collection_bulk_loader_impl.h +++ b/src/mongo/db/repl/collection_bulk_loader_impl.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" @@ -49,7 +48,8 @@ namespace repl { * Note: Call commit when done inserting documents. */ class CollectionBulkLoaderImpl : public CollectionBulkLoader { - MONGO_DISALLOW_COPYING(CollectionBulkLoaderImpl); + CollectionBulkLoaderImpl(const CollectionBulkLoaderImpl&) = delete; + CollectionBulkLoaderImpl& operator=(const CollectionBulkLoaderImpl&) = delete; public: struct Stats { diff --git a/src/mongo/db/repl/collection_cloner.h b/src/mongo/db/repl/collection_cloner.h index a7fbeca5922..ad14eb34f7f 100644 --- a/src/mongo/db/repl/collection_cloner.h +++ b/src/mongo/db/repl/collection_cloner.h @@ -33,7 +33,6 @@ #include <string> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" @@ -61,7 +60,8 @@ namespace repl { class StorageInterface; class CollectionCloner : public BaseCloner { - MONGO_DISALLOW_COPYING(CollectionCloner); + CollectionCloner(const CollectionCloner&) = delete; + CollectionCloner& operator=(const CollectionCloner&) = delete; public: /** diff --git a/src/mongo/db/repl/collection_cloner_test.cpp b/src/mongo/db/repl/collection_cloner_test.cpp index a8ca6efb7c7..c8f06889825 100644 --- a/src/mongo/db/repl/collection_cloner_test.cpp +++ b/src/mongo/db/repl/collection_cloner_test.cpp @@ -179,7 +179,8 @@ private: // RAII class to pause the client; since tests are very exception-heavy this prevents them // from hanging on failure. class MockClientPauser { - MONGO_DISALLOW_COPYING(MockClientPauser); + MockClientPauser(const MockClientPauser&) = delete; + MockClientPauser& operator=(const MockClientPauser&) = delete; public: MockClientPauser(FailableMockDBClientConnection* client) : _client(client) { @@ -1118,7 +1119,8 @@ TEST_F(CollectionClonerTest, CollectionClonerCannotBeRestartedAfterPreviousFailu bool sharedCallbackStateDestroyed = false; class SharedCallbackState { - MONGO_DISALLOW_COPYING(SharedCallbackState); + SharedCallbackState(const SharedCallbackState&) = delete; + SharedCallbackState& operator=(const SharedCallbackState&) = delete; public: SharedCallbackState() {} diff --git a/src/mongo/db/repl/data_replicator_external_state.h b/src/mongo/db/repl/data_replicator_external_state.h index 0cc4feb3bad..6ce205ff898 100644 --- a/src/mongo/db/repl/data_replicator_external_state.h +++ b/src/mongo/db/repl/data_replicator_external_state.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/repl/multiapplier.h" #include "mongo/db/repl/oplog_applier.h" @@ -66,7 +65,8 @@ using OpTimeWithTerm = OpTimeWith<long long>; * InitialSyncer should be moved here. */ class DataReplicatorExternalState { - MONGO_DISALLOW_COPYING(DataReplicatorExternalState); + DataReplicatorExternalState(const DataReplicatorExternalState&) = delete; + DataReplicatorExternalState& operator=(const DataReplicatorExternalState&) = delete; public: DataReplicatorExternalState() = default; diff --git a/src/mongo/db/repl/data_replicator_external_state_mock.cpp b/src/mongo/db/repl/data_replicator_external_state_mock.cpp index 2c164614fc4..96c69326412 100644 --- a/src/mongo/db/repl/data_replicator_external_state_mock.cpp +++ b/src/mongo/db/repl/data_replicator_external_state_mock.cpp @@ -40,7 +40,8 @@ namespace repl { namespace { class OplogApplierMock : public OplogApplier { - MONGO_DISALLOW_COPYING(OplogApplierMock); + OplogApplierMock(const OplogApplierMock&) = delete; + OplogApplierMock& operator=(const OplogApplierMock&) = delete; public: OplogApplierMock(executor::TaskExecutor* executor, diff --git a/src/mongo/db/repl/database_cloner.h b/src/mongo/db/repl/database_cloner.h index f888118d1e0..94b559d8278 100644 --- a/src/mongo/db/repl/database_cloner.h +++ b/src/mongo/db/repl/database_cloner.h @@ -34,7 +34,6 @@ #include <string> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/bson/bsonobj.h" #include "mongo/client/fetcher.h" @@ -53,7 +52,8 @@ namespace repl { class StorageInterface; class DatabaseCloner : public BaseCloner { - MONGO_DISALLOW_COPYING(DatabaseCloner); + DatabaseCloner(const DatabaseCloner&) = delete; + DatabaseCloner& operator=(const DatabaseCloner&) = delete; public: struct Stats { diff --git a/src/mongo/db/repl/databases_cloner.h b/src/mongo/db/repl/databases_cloner.h index 179425852c5..8d94afe26fc 100644 --- a/src/mongo/db/repl/databases_cloner.h +++ b/src/mongo/db/repl/databases_cloner.h @@ -33,7 +33,6 @@ #include <string> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" diff --git a/src/mongo/db/repl/databases_cloner_test.cpp b/src/mongo/db/repl/databases_cloner_test.cpp index 02cdcd1118d..c4828eca321 100644 --- a/src/mongo/db/repl/databases_cloner_test.cpp +++ b/src/mongo/db/repl/databases_cloner_test.cpp @@ -630,7 +630,8 @@ TEST_F(DBsClonerTest, DatabasesClonerReturnsCallbackCanceledIfShutdownDuringList bool sharedCallbackStateDestroyed = false; class SharedCallbackState { - MONGO_DISALLOW_COPYING(SharedCallbackState); + SharedCallbackState(const SharedCallbackState&) = delete; + SharedCallbackState& operator=(const SharedCallbackState&) = delete; public: SharedCallbackState() {} diff --git a/src/mongo/db/repl/drop_pending_collection_reaper.h b/src/mongo/db/repl/drop_pending_collection_reaper.h index 245ed2d4ca5..be8dd9a77d8 100644 --- a/src/mongo/db/repl/drop_pending_collection_reaper.h +++ b/src/mongo/db/repl/drop_pending_collection_reaper.h @@ -34,7 +34,6 @@ #include <map> #include <memory> -#include "mongo/base/disallow_copying.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/optime.h" #include "mongo/stdx/mutex.h" @@ -60,7 +59,8 @@ class StorageInterface; * dropCollectionsOlderThan() for this purpose. */ class DropPendingCollectionReaper { - MONGO_DISALLOW_COPYING(DropPendingCollectionReaper); + DropPendingCollectionReaper(const DropPendingCollectionReaper&) = delete; + DropPendingCollectionReaper& operator=(const DropPendingCollectionReaper&) = delete; public: // Operation Context binding. diff --git a/src/mongo/db/repl/initial_syncer.h b/src/mongo/db/repl/initial_syncer.h index 658db40d705..31c4790feb7 100644 --- a/src/mongo/db/repl/initial_syncer.h +++ b/src/mongo/db/repl/initial_syncer.h @@ -139,7 +139,8 @@ struct InitialSyncerOptions { * -- startup: Start initial sync. */ class InitialSyncer { - MONGO_DISALLOW_COPYING(InitialSyncer); + InitialSyncer(const InitialSyncer&) = delete; + InitialSyncer& operator=(const InitialSyncer&) = delete; public: /** diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp index a8ed2079d4d..48b134eda45 100644 --- a/src/mongo/db/repl/initial_syncer_test.cpp +++ b/src/mongo/db/repl/initial_syncer_test.cpp @@ -981,7 +981,8 @@ TEST_F(InitialSyncerTest, InitialSyncerTransitionsToCompleteWhenFinishCallbackTh } class SharedCallbackState { - MONGO_DISALLOW_COPYING(SharedCallbackState); + SharedCallbackState(const SharedCallbackState&) = delete; + SharedCallbackState& operator=(const SharedCallbackState&) = delete; public: explicit SharedCallbackState(bool* sharedCallbackStateDestroyed) diff --git a/src/mongo/db/repl/multiapplier.h b/src/mongo/db/repl/multiapplier.h index 5881a082e9b..87d34964c2f 100644 --- a/src/mongo/db/repl/multiapplier.h +++ b/src/mongo/db/repl/multiapplier.h @@ -35,7 +35,6 @@ #include <utility> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/db/jsobj.h" @@ -53,7 +52,8 @@ namespace repl { class OpTime; class MultiApplier { - MONGO_DISALLOW_COPYING(MultiApplier); + MultiApplier(const MultiApplier&) = delete; + MultiApplier& operator=(const MultiApplier&) = delete; public: /** diff --git a/src/mongo/db/repl/multiapplier_test.cpp b/src/mongo/db/repl/multiapplier_test.cpp index 1130fb67f5c..bafa8eef774 100644 --- a/src/mongo/db/repl/multiapplier_test.cpp +++ b/src/mongo/db/repl/multiapplier_test.cpp @@ -265,7 +265,8 @@ TEST_F( } class SharedCallbackState { - MONGO_DISALLOW_COPYING(SharedCallbackState); + SharedCallbackState(const SharedCallbackState&) = delete; + SharedCallbackState& operator=(const SharedCallbackState&) = delete; public: explicit SharedCallbackState(bool* sharedCallbackStateDestroyed) diff --git a/src/mongo/db/repl/noop_writer.cpp b/src/mongo/db/repl/noop_writer.cpp index 90b15f0f4ac..6897acab22c 100644 --- a/src/mongo/db/repl/noop_writer.cpp +++ b/src/mongo/db/repl/noop_writer.cpp @@ -60,7 +60,8 @@ const auto kMsgObj = BSON("msg" * Runs the noopWrite argument with waitTime period until its destroyed. */ class NoopWriter::PeriodicNoopRunner { - MONGO_DISALLOW_COPYING(PeriodicNoopRunner); + PeriodicNoopRunner(const PeriodicNoopRunner&) = delete; + PeriodicNoopRunner& operator=(const PeriodicNoopRunner&) = delete; using NoopWriteFn = stdx::function<void(OperationContext*)>; diff --git a/src/mongo/db/repl/noop_writer.h b/src/mongo/db/repl/noop_writer.h index 1fb713c249d..07f664668d0 100644 --- a/src/mongo/db/repl/noop_writer.h +++ b/src/mongo/db/repl/noop_writer.h @@ -43,7 +43,8 @@ namespace repl { * coordinator's optime has not changed since the last time it did a write. */ class NoopWriter { - MONGO_DISALLOW_COPYING(NoopWriter); + NoopWriter(const NoopWriter&) = delete; + NoopWriter& operator=(const NoopWriter&) = delete; public: NoopWriter(Seconds waitTime); diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp index b5a18749096..0aa23a1a07c 100644 --- a/src/mongo/db/repl/oplog.cpp +++ b/src/mongo/db/repl/oplog.cpp @@ -122,7 +122,8 @@ MONGO_FAIL_POINT_DEFINE(hangBeforeLogOpAdvancesLastApplied); * This structure contains per-service-context state related to the oplog. */ struct LocalOplogInfo { - MONGO_DISALLOW_COPYING(LocalOplogInfo); + LocalOplogInfo(const LocalOplogInfo&) = delete; + LocalOplogInfo& operator=(const LocalOplogInfo&) = delete; LocalOplogInfo() = default; // Name of the oplog collection. diff --git a/src/mongo/db/repl/oplog_applier.h b/src/mongo/db/repl/oplog_applier.h index d613ee0b7d2..9ee0f3d0b28 100644 --- a/src/mongo/db/repl/oplog_applier.h +++ b/src/mongo/db/repl/oplog_applier.h @@ -33,7 +33,6 @@ #include <boost/optional.hpp> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/db/repl/oplog_buffer.h" @@ -52,7 +51,8 @@ namespace repl { * Reads from an OplogBuffer batches of operations that may be applied in parallel. */ class OplogApplier { - MONGO_DISALLOW_COPYING(OplogApplier); + OplogApplier(const OplogApplier&) = delete; + OplogApplier& operator=(const OplogApplier&) = delete; public: /** diff --git a/src/mongo/db/repl/oplog_applier_impl.h b/src/mongo/db/repl/oplog_applier_impl.h index 0cb99b32c05..d6e0e523220 100644 --- a/src/mongo/db/repl/oplog_applier_impl.h +++ b/src/mongo/db/repl/oplog_applier_impl.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/oplog_applier.h" #include "mongo/db/repl/replication_consistency_markers.h" #include "mongo/db/repl/replication_coordinator.h" @@ -45,7 +44,8 @@ namespace repl { * Reads from an OplogBuffer batches of operations that may be applied in parallel. */ class OplogApplierImpl : public OplogApplier { - MONGO_DISALLOW_COPYING(OplogApplierImpl); + OplogApplierImpl(const OplogApplierImpl&) = delete; + OplogApplierImpl& operator=(const OplogApplierImpl&) = delete; public: /** diff --git a/src/mongo/db/repl/oplog_buffer.h b/src/mongo/db/repl/oplog_buffer.h index 7a35778a479..fe6007dc085 100644 --- a/src/mongo/db/repl/oplog_buffer.h +++ b/src/mongo/db/repl/oplog_buffer.h @@ -34,7 +34,6 @@ #include <vector> #include "mongo/base/counter.h" -#include "mongo/base/disallow_copying.h" #include "mongo/bson/bsonobj.h" #include "mongo/util/time_support.h" @@ -51,7 +50,8 @@ namespace repl { * Implementations are only required to support one pusher and one popper. */ class OplogBuffer { - MONGO_DISALLOW_COPYING(OplogBuffer); + OplogBuffer(const OplogBuffer&) = delete; + OplogBuffer& operator=(const OplogBuffer&) = delete; public: /** diff --git a/src/mongo/db/repl/oplog_buffer_proxy.h b/src/mongo/db/repl/oplog_buffer_proxy.h index 440d8616142..544b5b6739f 100644 --- a/src/mongo/db/repl/oplog_buffer_proxy.h +++ b/src/mongo/db/repl/oplog_buffer_proxy.h @@ -32,7 +32,6 @@ #include <boost/optional.hpp> #include <memory> -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/oplog_buffer.h" #include "mongo/stdx/mutex.h" @@ -46,7 +45,8 @@ class StorageInterface; * oplog buffer. */ class OplogBufferProxy : public OplogBuffer { - MONGO_DISALLOW_COPYING(OplogBufferProxy); + OplogBufferProxy(const OplogBufferProxy&) = delete; + OplogBufferProxy& operator=(const OplogBufferProxy&) = delete; public: explicit OplogBufferProxy(std::unique_ptr<OplogBuffer> target); diff --git a/src/mongo/db/repl/oplog_buffer_proxy_test.cpp b/src/mongo/db/repl/oplog_buffer_proxy_test.cpp index 95cc39b3b65..33173a8b75a 100644 --- a/src/mongo/db/repl/oplog_buffer_proxy_test.cpp +++ b/src/mongo/db/repl/oplog_buffer_proxy_test.cpp @@ -32,7 +32,6 @@ #include <boost/optional/optional_io.hpp> #include <deque> -#include "mongo/base/disallow_copying.h" #include "mongo/db/jsobj.h" #include "mongo/db/repl/oplog_buffer_proxy.h" #include "mongo/stdx/functional.h" @@ -46,7 +45,8 @@ using namespace mongo; using namespace mongo::repl; class OplogBufferMock : public OplogBuffer { - MONGO_DISALLOW_COPYING(OplogBufferMock); + OplogBufferMock(const OplogBufferMock&) = delete; + OplogBufferMock& operator=(const OplogBufferMock&) = delete; public: OplogBufferMock() = default; diff --git a/src/mongo/db/repl/oplog_fetcher.h b/src/mongo/db/repl/oplog_fetcher.h index cfc11787df5..c42f4a884c0 100644 --- a/src/mongo/db/repl/oplog_fetcher.h +++ b/src/mongo/db/repl/oplog_fetcher.h @@ -31,7 +31,6 @@ #include <cstddef> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/bson/timestamp.h" #include "mongo/client/fetcher.h" @@ -72,7 +71,8 @@ MONGO_FAIL_POINT_DECLARE(stopReplProducer); * `getMore` commands, and handles restarting on errors. */ class OplogFetcher : public AbstractOplogFetcher { - MONGO_DISALLOW_COPYING(OplogFetcher); + OplogFetcher(const OplogFetcher&) = delete; + OplogFetcher& operator=(const OplogFetcher&) = delete; public: static Seconds kDefaultProtocolZeroAwaitDataTimeout; diff --git a/src/mongo/db/repl/oplog_interface.h b/src/mongo/db/repl/oplog_interface.h index 04cfb40f532..710e1b6de6b 100644 --- a/src/mongo/db/repl/oplog_interface.h +++ b/src/mongo/db/repl/oplog_interface.h @@ -33,7 +33,6 @@ #include <string> #include <utility> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/record_id.h" @@ -43,7 +42,8 @@ namespace mongo { namespace repl { class OplogInterface { - MONGO_DISALLOW_COPYING(OplogInterface); + OplogInterface(const OplogInterface&) = delete; + OplogInterface& operator=(const OplogInterface&) = delete; public: class Iterator; @@ -70,7 +70,8 @@ protected: }; class OplogInterface::Iterator { - MONGO_DISALLOW_COPYING(Iterator); + Iterator(const Iterator&) = delete; + Iterator& operator=(const Iterator&) = delete; public: using Value = std::pair<BSONObj, RecordId>; diff --git a/src/mongo/db/repl/oplog_interface_mock.h b/src/mongo/db/repl/oplog_interface_mock.h index 813fda41605..678a0b28c8c 100644 --- a/src/mongo/db/repl/oplog_interface_mock.h +++ b/src/mongo/db/repl/oplog_interface_mock.h @@ -39,7 +39,8 @@ namespace repl { * Simulates oplog for testing rollback functionality. */ class OplogInterfaceMock : public OplogInterface { - MONGO_DISALLOW_COPYING(OplogInterfaceMock); + OplogInterfaceMock(const OplogInterfaceMock&) = delete; + OplogInterfaceMock& operator=(const OplogInterfaceMock&) = delete; public: using Operation = std::pair<BSONObj, RecordId>; diff --git a/src/mongo/db/repl/replication_consistency_markers.h b/src/mongo/db/repl/replication_consistency_markers.h index 82118277986..894aec89f66 100644 --- a/src/mongo/db/repl/replication_consistency_markers.h +++ b/src/mongo/db/repl/replication_consistency_markers.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/namespace_string.h" namespace mongo { @@ -75,7 +74,8 @@ class StorageInterface; * See below for explanations of each field. */ class ReplicationConsistencyMarkers { - MONGO_DISALLOW_COPYING(ReplicationConsistencyMarkers); + ReplicationConsistencyMarkers(const ReplicationConsistencyMarkers&) = delete; + ReplicationConsistencyMarkers& operator=(const ReplicationConsistencyMarkers&) = delete; public: // Constructor and Destructor. diff --git a/src/mongo/db/repl/replication_consistency_markers_impl.h b/src/mongo/db/repl/replication_consistency_markers_impl.h index 5e64762d490..cb3b8ecf6cc 100644 --- a/src/mongo/db/repl/replication_consistency_markers_impl.h +++ b/src/mongo/db/repl/replication_consistency_markers_impl.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/replication_consistency_markers.h" #include "mongo/db/repl/replication_consistency_markers_gen.h" @@ -47,7 +46,8 @@ class StorageInterface; struct TimestampedBSONObj; class ReplicationConsistencyMarkersImpl : public ReplicationConsistencyMarkers { - MONGO_DISALLOW_COPYING(ReplicationConsistencyMarkersImpl); + ReplicationConsistencyMarkersImpl(const ReplicationConsistencyMarkersImpl&) = delete; + ReplicationConsistencyMarkersImpl& operator=(const ReplicationConsistencyMarkersImpl&) = delete; public: static constexpr StringData kDefaultMinValidNamespace = "local.replset.minvalid"_sd; diff --git a/src/mongo/db/repl/replication_consistency_markers_mock.h b/src/mongo/db/repl/replication_consistency_markers_mock.h index 165c6185c43..3215264110f 100644 --- a/src/mongo/db/repl/replication_consistency_markers_mock.h +++ b/src/mongo/db/repl/replication_consistency_markers_mock.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/replication_consistency_markers.h" #include "mongo/stdx/mutex.h" @@ -46,7 +45,8 @@ namespace repl { * A mock ReplicationConsistencyMarkers implementation that stores everything in memory. */ class ReplicationConsistencyMarkersMock : public ReplicationConsistencyMarkers { - MONGO_DISALLOW_COPYING(ReplicationConsistencyMarkersMock); + ReplicationConsistencyMarkersMock(const ReplicationConsistencyMarkersMock&) = delete; + ReplicationConsistencyMarkersMock& operator=(const ReplicationConsistencyMarkersMock&) = delete; public: ReplicationConsistencyMarkersMock() = default; diff --git a/src/mongo/db/repl/replication_coordinator.h b/src/mongo/db/repl/replication_coordinator.h index 6b63d156b17..7efc12c9994 100644 --- a/src/mongo/db/repl/replication_coordinator.h +++ b/src/mongo/db/repl/replication_coordinator.h @@ -31,7 +31,6 @@ #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/timestamp.h" @@ -85,7 +84,8 @@ class UpdatePositionArgs; * API that the replication subsystem presents to the rest of the codebase. */ class ReplicationCoordinator : public SyncSourceSelector { - MONGO_DISALLOW_COPYING(ReplicationCoordinator); + ReplicationCoordinator(const ReplicationCoordinator&) = delete; + ReplicationCoordinator& operator=(const ReplicationCoordinator&) = delete; public: static ReplicationCoordinator* get(ServiceContext* service); diff --git a/src/mongo/db/repl/replication_coordinator_external_state.h b/src/mongo/db/repl/replication_coordinator_external_state.h index a7bb4c6bdd0..aa81dc2b6cf 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state.h +++ b/src/mongo/db/repl/replication_coordinator_external_state.h @@ -32,7 +32,6 @@ #include <boost/optional.hpp> #include <cstddef> -#include "mongo/base/disallow_copying.h" #include "mongo/bson/timestamp.h" #include "mongo/db/repl/member_state.h" #include "mongo/db/repl/optime.h" @@ -65,7 +64,9 @@ class ReplicationCoordinator; * ReplicationCoordinatorImpl should be moved here. */ class ReplicationCoordinatorExternalState { - MONGO_DISALLOW_COPYING(ReplicationCoordinatorExternalState); + ReplicationCoordinatorExternalState(const ReplicationCoordinatorExternalState&) = delete; + ReplicationCoordinatorExternalState& operator=(const ReplicationCoordinatorExternalState&) = + delete; public: ReplicationCoordinatorExternalState() {} diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.h b/src/mongo/db/repl/replication_coordinator_external_state_impl.h index fb6ea07d80f..0cdef723c00 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_impl.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.h @@ -31,7 +31,6 @@ #include <deque> -#include "mongo/base/disallow_copying.h" #include "mongo/db/concurrency/d_concurrency.h" #include "mongo/db/repl/bgsync.h" #include "mongo/db/repl/oplog_applier.h" @@ -58,7 +57,10 @@ class NoopWriter; class ReplicationCoordinatorExternalStateImpl final : public ReplicationCoordinatorExternalState, public JournalListener { - MONGO_DISALLOW_COPYING(ReplicationCoordinatorExternalStateImpl); + ReplicationCoordinatorExternalStateImpl(const ReplicationCoordinatorExternalStateImpl&) = + delete; + ReplicationCoordinatorExternalStateImpl& operator=( + const ReplicationCoordinatorExternalStateImpl&) = delete; public: ReplicationCoordinatorExternalStateImpl( diff --git a/src/mongo/db/repl/replication_coordinator_external_state_mock.h b/src/mongo/db/repl/replication_coordinator_external_state_mock.h index 6311dd446b1..eeda5419db9 100644 --- a/src/mongo/db/repl/replication_coordinator_external_state_mock.h +++ b/src/mongo/db/repl/replication_coordinator_external_state_mock.h @@ -31,7 +31,6 @@ #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" @@ -50,7 +49,10 @@ class ServiceContext; namespace repl { class ReplicationCoordinatorExternalStateMock : public ReplicationCoordinatorExternalState { - MONGO_DISALLOW_COPYING(ReplicationCoordinatorExternalStateMock); + ReplicationCoordinatorExternalStateMock(const ReplicationCoordinatorExternalStateMock&) = + delete; + ReplicationCoordinatorExternalStateMock& operator=( + const ReplicationCoordinatorExternalStateMock&) = delete; public: class GlobalSharedLockAcquirer; diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index c0a6e03c39e..674e244acd8 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -129,7 +129,8 @@ const OperationContext::Decoration<bool> alwaysAllowNonLocalWrites = * Resets to original value when leaving scope so it is safe to nest. */ class AllowNonLocalWritesBlock { - MONGO_DISALLOW_COPYING(AllowNonLocalWritesBlock); + AllowNonLocalWritesBlock(const AllowNonLocalWritesBlock&) = delete; + AllowNonLocalWritesBlock& operator=(const AllowNonLocalWritesBlock&) = delete; public: AllowNonLocalWritesBlock(OperationContext* opCtx) diff --git a/src/mongo/db/repl/replication_coordinator_impl.h b/src/mongo/db/repl/replication_coordinator_impl.h index 195e11d799b..52a862292c3 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.h +++ b/src/mongo/db/repl/replication_coordinator_impl.h @@ -82,7 +82,8 @@ class TopologyCoordinator; class VoteRequester; class ReplicationCoordinatorImpl : public ReplicationCoordinator { - MONGO_DISALLOW_COPYING(ReplicationCoordinatorImpl); + ReplicationCoordinatorImpl(const ReplicationCoordinatorImpl&) = delete; + ReplicationCoordinatorImpl& operator=(const ReplicationCoordinatorImpl&) = delete; public: ReplicationCoordinatorImpl(ServiceContext* serviceContext, diff --git a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp index 73fee3bf73e..e8415946dfc 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_elect_v1.cpp @@ -33,7 +33,6 @@ #include <memory> -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/replication_coordinator_impl.h" #include "mongo/db/repl/topology_coordinator.h" #include "mongo/db/repl/vote_requester.h" @@ -45,7 +44,8 @@ namespace mongo { namespace repl { class ReplicationCoordinatorImpl::LoseElectionGuardV1 { - MONGO_DISALLOW_COPYING(LoseElectionGuardV1); + LoseElectionGuardV1(const LoseElectionGuardV1&) = delete; + LoseElectionGuardV1& operator=(const LoseElectionGuardV1&) = delete; public: LoseElectionGuardV1(ReplicationCoordinatorImpl* replCoord) : _replCoord(replCoord) {} @@ -76,7 +76,8 @@ protected: }; class ReplicationCoordinatorImpl::LoseElectionDryRunGuardV1 : public LoseElectionGuardV1 { - MONGO_DISALLOW_COPYING(LoseElectionDryRunGuardV1); + LoseElectionDryRunGuardV1(const LoseElectionDryRunGuardV1&) = delete; + LoseElectionDryRunGuardV1& operator=(const LoseElectionDryRunGuardV1&) = delete; public: LoseElectionDryRunGuardV1(ReplicationCoordinatorImpl* replCoord) diff --git a/src/mongo/db/repl/replication_coordinator_mock.h b/src/mongo/db/repl/replication_coordinator_mock.h index 1fc093a635b..23c1c4080ac 100644 --- a/src/mongo/db/repl/replication_coordinator_mock.h +++ b/src/mongo/db/repl/replication_coordinator_mock.h @@ -50,7 +50,8 @@ namespace repl { * into dbtests. */ class ReplicationCoordinatorMock : public ReplicationCoordinator { - MONGO_DISALLOW_COPYING(ReplicationCoordinatorMock); + ReplicationCoordinatorMock(const ReplicationCoordinatorMock&) = delete; + ReplicationCoordinatorMock& operator=(const ReplicationCoordinatorMock&) = delete; public: ReplicationCoordinatorMock(ServiceContext* service, const ReplSettings& settings); diff --git a/src/mongo/db/repl/replication_process.h b/src/mongo/db/repl/replication_process.h index aae288504c6..849ac7df8c4 100644 --- a/src/mongo/db/repl/replication_process.h +++ b/src/mongo/db/repl/replication_process.h @@ -32,7 +32,6 @@ #include <memory> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/db/namespace_string.h" @@ -60,7 +59,8 @@ class StorageInterface; * This class DOES NOT hold any information related to the consensus protocol. */ class ReplicationProcess { - MONGO_DISALLOW_COPYING(ReplicationProcess); + ReplicationProcess(const ReplicationProcess&) = delete; + ReplicationProcess& operator=(const ReplicationProcess&) = delete; public: static const int kUninitializedRollbackId = -1; diff --git a/src/mongo/db/repl/replication_recovery.h b/src/mongo/db/repl/replication_recovery.h index 68a86833fcd..a33cb15e51c 100644 --- a/src/mongo/db/repl/replication_recovery.h +++ b/src/mongo/db/repl/replication_recovery.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/repl/optime.h" @@ -59,7 +58,8 @@ public: }; class ReplicationRecoveryImpl : public ReplicationRecovery { - MONGO_DISALLOW_COPYING(ReplicationRecoveryImpl); + ReplicationRecoveryImpl(const ReplicationRecoveryImpl&) = delete; + ReplicationRecoveryImpl& operator=(const ReplicationRecoveryImpl&) = delete; public: ReplicationRecoveryImpl(StorageInterface* storageInterface, diff --git a/src/mongo/db/repl/replication_recovery_mock.h b/src/mongo/db/repl/replication_recovery_mock.h index a908c84de84..77835215ca3 100644 --- a/src/mongo/db/repl/replication_recovery_mock.h +++ b/src/mongo/db/repl/replication_recovery_mock.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/replication_recovery.h" namespace mongo { @@ -37,7 +36,8 @@ class OperationContext; namespace repl { class ReplicationRecoveryMock : public ReplicationRecovery { - MONGO_DISALLOW_COPYING(ReplicationRecoveryMock); + ReplicationRecoveryMock(const ReplicationRecoveryMock&) = delete; + ReplicationRecoveryMock& operator=(const ReplicationRecoveryMock&) = delete; public: ReplicationRecoveryMock() = default; diff --git a/src/mongo/db/repl/reporter.h b/src/mongo/db/repl/reporter.h index 8a10c2a1a02..f332401ea2e 100644 --- a/src/mongo/db/repl/reporter.h +++ b/src/mongo/db/repl/reporter.h @@ -63,7 +63,8 @@ namespace repl { * keep alive timeout, resetting the keep alive schedule. */ class Reporter { - MONGO_DISALLOW_COPYING(Reporter); + Reporter(const Reporter&) = delete; + Reporter& operator=(const Reporter&) = delete; public: /** diff --git a/src/mongo/db/repl/roll_back_local_operations.h b/src/mongo/db/repl/roll_back_local_operations.h index c1c44578ef2..7d21b2feb74 100644 --- a/src/mongo/db/repl/roll_back_local_operations.h +++ b/src/mongo/db/repl/roll_back_local_operations.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/bson/bsonobj.h" @@ -52,7 +51,8 @@ MONGO_FAIL_POINT_DECLARE(rollbackHangBeforeFinish); MONGO_FAIL_POINT_DECLARE(rollbackHangThenFailAfterWritingMinValid); class RollBackLocalOperations { - MONGO_DISALLOW_COPYING(RollBackLocalOperations); + RollBackLocalOperations(const RollBackLocalOperations&) = delete; + RollBackLocalOperations& operator=(const RollBackLocalOperations&) = delete; public: class RollbackCommonPoint { diff --git a/src/mongo/db/repl/rollback.h b/src/mongo/db/repl/rollback.h index d7ca747afa3..26af57b79e9 100644 --- a/src/mongo/db/repl/rollback.h +++ b/src/mongo/db/repl/rollback.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/repl/optime.h" #include "mongo/stdx/functional.h" @@ -42,7 +41,8 @@ namespace repl { * interact with the rollback subsystem. */ class Rollback { - MONGO_DISALLOW_COPYING(Rollback); + Rollback(const Rollback&) = delete; + Rollback& operator=(const Rollback&) = delete; public: /** diff --git a/src/mongo/db/repl/rollback_checker.h b/src/mongo/db/repl/rollback_checker.h index c1f3d2fda00..ed589e57c7c 100644 --- a/src/mongo/db/repl/rollback_checker.h +++ b/src/mongo/db/repl/rollback_checker.h @@ -60,7 +60,8 @@ class Mutex; * */ class RollbackChecker { - MONGO_DISALLOW_COPYING(RollbackChecker); + RollbackChecker(const RollbackChecker&) = delete; + RollbackChecker& operator=(const RollbackChecker&) = delete; public: // Rollback checker result - true if rollback occurred; false if rollback IDs diff --git a/src/mongo/db/repl/rollback_source.h b/src/mongo/db/repl/rollback_source.h index e86473e7aef..5d58240b820 100644 --- a/src/mongo/db/repl/rollback_source.h +++ b/src/mongo/db/repl/rollback_source.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status_with.h" #include "mongo/db/jsobj.h" #include "mongo/util/net/hostandport.h" @@ -48,7 +47,8 @@ class OplogInterface; * Interface for rollback-related operations on the sync source. */ class RollbackSource { - MONGO_DISALLOW_COPYING(RollbackSource); + RollbackSource(const RollbackSource&) = delete; + RollbackSource& operator=(const RollbackSource&) = delete; public: RollbackSource() = default; diff --git a/src/mongo/db/repl/scatter_gather_runner.h b/src/mongo/db/repl/scatter_gather_runner.h index 5fe7f08b894..4d65e417efb 100644 --- a/src/mongo/db/repl/scatter_gather_runner.h +++ b/src/mongo/db/repl/scatter_gather_runner.h @@ -31,7 +31,6 @@ #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/executor/task_executor.h" #include "mongo/stdx/functional.h" #include "mongo/stdx/mutex.h" @@ -49,7 +48,8 @@ class ScatterGatherAlgorithm; * Interface of a scatter-gather behavior. */ class ScatterGatherRunner { - MONGO_DISALLOW_COPYING(ScatterGatherRunner); + ScatterGatherRunner(const ScatterGatherRunner&) = delete; + ScatterGatherRunner& operator=(const ScatterGatherRunner&) = delete; public: /** diff --git a/src/mongo/db/repl/storage_interface.h b/src/mongo/db/repl/storage_interface.h index 6339d31f475..9ea9ee02929 100644 --- a/src/mongo/db/repl/storage_interface.h +++ b/src/mongo/db/repl/storage_interface.h @@ -35,7 +35,6 @@ #include <iosfwd> #include <string> -#include "mongo/base/disallow_copying.h" #include "mongo/base/string_data.h" #include "mongo/bson/timestamp.h" #include "mongo/db/catalog/collection.h" @@ -71,7 +70,8 @@ struct TimestampedBSONObj { * * Insert documents into a collection */ class StorageInterface { - MONGO_DISALLOW_COPYING(StorageInterface); + StorageInterface(const StorageInterface&) = delete; + StorageInterface& operator=(const StorageInterface&) = delete; public: // Operation Context binding. diff --git a/src/mongo/db/repl/storage_interface_impl.h b/src/mongo/db/repl/storage_interface_impl.h index a62587f9a6c..24538fed00f 100644 --- a/src/mongo/db/repl/storage_interface_impl.h +++ b/src/mongo/db/repl/storage_interface_impl.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" @@ -43,7 +42,8 @@ namespace mongo { namespace repl { class StorageInterfaceImpl : public StorageInterface { - MONGO_DISALLOW_COPYING(StorageInterfaceImpl); + StorageInterfaceImpl(const StorageInterfaceImpl&) = delete; + StorageInterfaceImpl& operator=(const StorageInterfaceImpl&) = delete; public: static const char kDefaultRollbackIdNamespace[]; diff --git a/src/mongo/db/repl/storage_interface_mock.h b/src/mongo/db/repl/storage_interface_mock.h index 2dca3362dde..fd1084ccfe9 100644 --- a/src/mongo/db/repl/storage_interface_mock.h +++ b/src/mongo/db/repl/storage_interface_mock.h @@ -36,7 +36,6 @@ #include <string> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/status_with.h" #include "mongo/base/string_data.h" @@ -56,7 +55,8 @@ struct CollectionMockStats { }; class CollectionBulkLoaderMock : public CollectionBulkLoader { - MONGO_DISALLOW_COPYING(CollectionBulkLoaderMock); + CollectionBulkLoaderMock(const CollectionBulkLoaderMock&) = delete; + CollectionBulkLoaderMock& operator=(const CollectionBulkLoaderMock&) = delete; public: explicit CollectionBulkLoaderMock(std::shared_ptr<CollectionMockStats> collStats) @@ -87,7 +87,8 @@ public: }; class StorageInterfaceMock : public StorageInterface { - MONGO_DISALLOW_COPYING(StorageInterfaceMock); + StorageInterfaceMock(const StorageInterfaceMock&) = delete; + StorageInterfaceMock& operator=(const StorageInterfaceMock&) = delete; public: // Used for testing. diff --git a/src/mongo/db/repl/sync_source_feedback.h b/src/mongo/db/repl/sync_source_feedback.h index 855e10f6523..a75cb23ad64 100644 --- a/src/mongo/db/repl/sync_source_feedback.h +++ b/src/mongo/db/repl/sync_source_feedback.h @@ -30,7 +30,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/stdx/condition_variable.h" @@ -49,7 +48,8 @@ class BackgroundSync; class Reporter; class SyncSourceFeedback { - MONGO_DISALLOW_COPYING(SyncSourceFeedback); + SyncSourceFeedback(const SyncSourceFeedback&) = delete; + SyncSourceFeedback& operator=(const SyncSourceFeedback&) = delete; public: SyncSourceFeedback() = default; diff --git a/src/mongo/db/repl/sync_source_selector.h b/src/mongo/db/repl/sync_source_selector.h index 393837727bf..0a620d691a2 100644 --- a/src/mongo/db/repl/sync_source_selector.h +++ b/src/mongo/db/repl/sync_source_selector.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/rpc/metadata/oplog_query_metadata.h" #include "mongo/util/net/hostandport.h" #include "mongo/util/time_support.h" @@ -53,7 +52,8 @@ struct SyncSourceResolverResponse; * Manage list of viable and blocked sync sources that we can replicate from. */ class SyncSourceSelector { - MONGO_DISALLOW_COPYING(SyncSourceSelector); + SyncSourceSelector(const SyncSourceSelector&) = delete; + SyncSourceSelector& operator=(const SyncSourceSelector&) = delete; public: SyncSourceSelector() = default; diff --git a/src/mongo/db/repl/sync_source_selector_mock.h b/src/mongo/db/repl/sync_source_selector_mock.h index a9837bc6f0d..cbf8df0fe9f 100644 --- a/src/mongo/db/repl/sync_source_selector_mock.h +++ b/src/mongo/db/repl/sync_source_selector_mock.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/sync_source_selector.h" #include "mongo/stdx/functional.h" @@ -41,7 +40,8 @@ namespace repl { * Mock implementation of SyncSourceSelector interface for testing. */ class SyncSourceSelectorMock : public SyncSourceSelector { - MONGO_DISALLOW_COPYING(SyncSourceSelectorMock); + SyncSourceSelectorMock(const SyncSourceSelectorMock&) = delete; + SyncSourceSelectorMock& operator=(const SyncSourceSelectorMock&) = delete; public: using ChooseNewSyncSourceHook = stdx::function<void()>; diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp index 5870c6e57e9..399bede7329 100644 --- a/src/mongo/db/repl/sync_tail.cpp +++ b/src/mongo/db/repl/sync_tail.cpp @@ -570,7 +570,8 @@ void tryToGoLiveAsASecondary(OperationContext* opCtx, } // namespace class SyncTail::OpQueueBatcher { - MONGO_DISALLOW_COPYING(OpQueueBatcher); + OpQueueBatcher(const OpQueueBatcher&) = delete; + OpQueueBatcher& operator=(const OpQueueBatcher&) = delete; public: OpQueueBatcher(SyncTail* syncTail, StorageInterface* storageInterface, OplogBuffer* oplogBuffer) diff --git a/src/mongo/db/repl/task_runner.h b/src/mongo/db/repl/task_runner.h index 19af9e8fbf8..a63a428177f 100644 --- a/src/mongo/db/repl/task_runner.h +++ b/src/mongo/db/repl/task_runner.h @@ -31,7 +31,6 @@ #include <list> -#include "mongo/base/disallow_copying.h" #include "mongo/db/service_context.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/functional.h" @@ -47,7 +46,8 @@ class OperationContext; namespace repl { class TaskRunner { - MONGO_DISALLOW_COPYING(TaskRunner); + TaskRunner(const TaskRunner&) = delete; + TaskRunner& operator=(const TaskRunner&) = delete; public: /** diff --git a/src/mongo/db/repl/timestamp_block.h b/src/mongo/db/repl/timestamp_block.h index 1f512128d93..4d47ec3146a 100644 --- a/src/mongo/db/repl/timestamp_block.h +++ b/src/mongo/db/repl/timestamp_block.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/bson/timestamp.h" #include "mongo/db/operation_context.h" @@ -41,7 +40,8 @@ namespace mongo { * TimestampBlock is in scope. */ class TimestampBlock { - MONGO_DISALLOW_COPYING(TimestampBlock); + TimestampBlock(const TimestampBlock&) = delete; + TimestampBlock& operator=(const TimestampBlock&) = delete; public: TimestampBlock(OperationContext* opCtx, Timestamp ts); diff --git a/src/mongo/db/repl/topology_coordinator.h b/src/mongo/db/repl/topology_coordinator.h index d84adb67f43..9b89cd0bce7 100644 --- a/src/mongo/db/repl/topology_coordinator.h +++ b/src/mongo/db/repl/topology_coordinator.h @@ -32,7 +32,6 @@ #include <iosfwd> #include <string> -#include "mongo/base/disallow_copying.h" #include "mongo/db/repl/last_vote.h" #include "mongo/db/repl/repl_set_heartbeat_response.h" #include "mongo/db/repl/replication_coordinator.h" @@ -65,7 +64,8 @@ const int kMaxHeartbeatRetries = 2; * Methods of this class should be non-blocking. */ class TopologyCoordinator { - MONGO_DISALLOW_COPYING(TopologyCoordinator); + TopologyCoordinator(const TopologyCoordinator&) = delete; + TopologyCoordinator& operator=(const TopologyCoordinator&) = delete; public: /** diff --git a/src/mongo/db/repl/vote_requester.h b/src/mongo/db/repl/vote_requester.h index 396080834e2..c411065a988 100644 --- a/src/mongo/db/repl/vote_requester.h +++ b/src/mongo/db/repl/vote_requester.h @@ -32,7 +32,6 @@ #include <memory> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/bson/timestamp.h" #include "mongo/db/repl/optime.h" #include "mongo/db/repl/repl_set_config.h" @@ -49,7 +48,8 @@ class Status; namespace repl { class VoteRequester { - MONGO_DISALLOW_COPYING(VoteRequester); + VoteRequester(const VoteRequester&) = delete; + VoteRequester& operator=(const VoteRequester&) = delete; public: enum class Result { kSuccessfullyElected, kStaleTerm, kInsufficientVotes, kPrimaryRespondedNo }; |