diff options
Diffstat (limited to 'src/mongo/s/catalog')
-rw-r--r-- | src/mongo/s/catalog/dist_lock_catalog.h | 4 | ||||
-rw-r--r-- | src/mongo/s/catalog/dist_lock_manager.h | 4 | ||||
-rw-r--r-- | src/mongo/s/catalog/sharding_catalog_client.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/s/catalog/dist_lock_catalog.h b/src/mongo/s/catalog/dist_lock_catalog.h index a3d596b26ac..7f774915b66 100644 --- a/src/mongo/s/catalog/dist_lock_catalog.h +++ b/src/mongo/s/catalog/dist_lock_catalog.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/string_data.h" #include "mongo/bson/oid.h" #include "mongo/db/write_concern_options.h" @@ -48,7 +47,8 @@ class StatusWith; * Interface for the distributed lock operations. */ class DistLockCatalog { - MONGO_DISALLOW_COPYING(DistLockCatalog); + DistLockCatalog(const DistLockCatalog&) = delete; + DistLockCatalog& operator=(const DistLockCatalog&) = delete; public: static const WriteConcernOptions kLocalWriteConcern; diff --git a/src/mongo/s/catalog/dist_lock_manager.h b/src/mongo/s/catalog/dist_lock_manager.h index 58941efeb1c..97a63a8f096 100644 --- a/src/mongo/s/catalog/dist_lock_manager.h +++ b/src/mongo/s/catalog/dist_lock_manager.h @@ -29,7 +29,6 @@ #pragma once -#include "mongo/base/disallow_copying.h" #include "mongo/base/string_data.h" #include "mongo/bson/oid.h" #include "mongo/stdx/chrono.h" @@ -74,7 +73,8 @@ public: * RAII type for distributed lock. Not meant to be shared across multiple threads. */ class ScopedDistLock { - MONGO_DISALLOW_COPYING(ScopedDistLock); + ScopedDistLock(const ScopedDistLock&) = delete; + ScopedDistLock& operator=(const ScopedDistLock&) = delete; public: ScopedDistLock(OperationContext* opCtx, diff --git a/src/mongo/s/catalog/sharding_catalog_client.h b/src/mongo/s/catalog/sharding_catalog_client.h index 84b541198f2..cb16b5d26f9 100644 --- a/src/mongo/s/catalog/sharding_catalog_client.h +++ b/src/mongo/s/catalog/sharding_catalog_client.h @@ -34,7 +34,6 @@ #include <string> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/db/keys_collection_document.h" #include "mongo/db/repl/optime_with.h" #include "mongo/db/write_concern_options.h" @@ -83,7 +82,8 @@ struct ConnectionPoolStats; * move to be run on the config server primary. */ class ShardingCatalogClient { - MONGO_DISALLOW_COPYING(ShardingCatalogClient); + ShardingCatalogClient(const ShardingCatalogClient&) = delete; + ShardingCatalogClient& operator=(const ShardingCatalogClient&) = delete; // Allows ShardingCatalogManager to access _exhaustiveFindOnConfig friend class ShardingCatalogManager; |