summaryrefslogtreecommitdiff
path: root/src/mongo/db/concurrency/locker.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/concurrency/locker.h')
-rw-r--r--src/mongo/db/concurrency/locker.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/db/concurrency/locker.h b/src/mongo/db/concurrency/locker.h
index 158d073ae35..24f9dfbd532 100644
--- a/src/mongo/db/concurrency/locker.h
+++ b/src/mongo/db/concurrency/locker.h
@@ -46,7 +46,8 @@ namespace mongo {
* Lock/unlock methods must always be called from a single thread.
*/
class Locker {
- MONGO_DISALLOW_COPYING(Locker);
+ Locker(const Locker&) = delete;
+ Locker& operator=(const Locker&) = delete;
friend class UninterruptibleLockGuard;
@@ -537,7 +538,10 @@ private:
* RAII-style class to opt out of replication's use of ParallelBatchWriterMode.
*/
class ShouldNotConflictWithSecondaryBatchApplicationBlock {
- MONGO_DISALLOW_COPYING(ShouldNotConflictWithSecondaryBatchApplicationBlock);
+ ShouldNotConflictWithSecondaryBatchApplicationBlock(
+ const ShouldNotConflictWithSecondaryBatchApplicationBlock&) = delete;
+ ShouldNotConflictWithSecondaryBatchApplicationBlock& operator=(
+ const ShouldNotConflictWithSecondaryBatchApplicationBlock&) = delete;
public:
explicit ShouldNotConflictWithSecondaryBatchApplicationBlock(Locker* lockState)