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/exec/working_set.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/exec/working_set.h')
-rw-r--r-- | src/mongo/db/exec/working_set.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mongo/db/exec/working_set.h b/src/mongo/db/exec/working_set.h index 248ab944517..fc6a228036d 100644 --- a/src/mongo/db/exec/working_set.h +++ b/src/mongo/db/exec/working_set.h @@ -32,7 +32,6 @@ #include "boost/optional.hpp" #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/db/jsobj.h" #include "mongo/db/record_id.h" #include "mongo/db/storage/snapshot.h" @@ -51,7 +50,8 @@ typedef size_t WorkingSetID; * from the working set, or mutate elements in the working set. */ class WorkingSet { - MONGO_DISALLOW_COPYING(WorkingSet); + WorkingSet(const WorkingSet&) = delete; + WorkingSet& operator=(const WorkingSet&) = delete; public: static const WorkingSetID INVALID_ID = WorkingSetID(-1); @@ -208,7 +208,8 @@ enum WorkingSetComputedDataType { * Data that is a computed function of a WSM. */ class WorkingSetComputedData { - MONGO_DISALLOW_COPYING(WorkingSetComputedData); + WorkingSetComputedData(const WorkingSetComputedData&) = delete; + WorkingSetComputedData& operator=(const WorkingSetComputedData&) = delete; public: WorkingSetComputedData(const WorkingSetComputedDataType type) : _type(type) {} @@ -234,7 +235,8 @@ private: * A WorkingSetMember may have any of the data above. */ class WorkingSetMember { - MONGO_DISALLOW_COPYING(WorkingSetMember); + WorkingSetMember(const WorkingSetMember&) = delete; + WorkingSetMember& operator=(const WorkingSetMember&) = delete; public: WorkingSetMember(); |