diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2019-03-27 12:21:37 -0400 |
---|---|---|
committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-03-28 10:13:21 -0400 |
commit | f922827d45ce752e148185dfa3a785f7c9cf29fd (patch) | |
tree | b3ae7fdba18d9ef3384af6e0d009d091e5df14a3 /src/mongo/db/concurrency/locker.h | |
parent | f2f422d92b639edba0a10d40a43803723cb15baf (diff) | |
download | mongo-f922827d45ce752e148185dfa3a785f7c9cf29fd.tar.gz |
SERVER-40357 expand all calls to MONGO_DISALLOW_COPYING
produced by:
hits="$(git grep -n MONGO_DISALLOW_COPYING | cut -d: -f1 )"
for f in "$hits"; do
sed -i.orig '
s/^\( *\)MONGO_DISALLOW_COPYING(\(.*\));/\1\2(const \2\&) = delete;\n\1\2\& operator=(const \2\&) = delete;/;
' $f
done
Diffstat (limited to 'src/mongo/db/concurrency/locker.h')
-rw-r--r-- | src/mongo/db/concurrency/locker.h | 8 |
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) |