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/util/net | |
| 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/util/net')
| -rw-r--r-- | src/mongo/util/net/sock.h | 4 | ||||
| -rw-r--r-- | src/mongo/util/net/ssl_manager.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/util/net/sock.h b/src/mongo/util/net/sock.h index 071cd2a7ced..8079ab00acb 100644 --- a/src/mongo/util/net/sock.h +++ b/src/mongo/util/net/sock.h @@ -50,7 +50,6 @@ #include <utility> #include <vector> -#include "mongo/base/disallow_copying.h" #include "mongo/config.h" #include "mongo/logger/log_severity.h" #include "mongo/platform/compiler.h" @@ -83,7 +82,8 @@ typedef int SOCKET; * todo: ssl */ class Socket { - MONGO_DISALLOW_COPYING(Socket); + Socket(const Socket&) = delete; + Socket& operator=(const Socket&) = delete; public: static const int errorPollIntervalSecs; diff --git a/src/mongo/util/net/ssl_manager.h b/src/mongo/util/net/ssl_manager.h index 7a8f5889d1b..de77d2951ae 100644 --- a/src/mongo/util/net/ssl_manager.h +++ b/src/mongo/util/net/ssl_manager.h @@ -37,7 +37,6 @@ #ifdef MONGO_CONFIG_SSL -#include "mongo/base/disallow_copying.h" #include "mongo/base/string_data.h" #include "mongo/bson/bsonobj.h" #include "mongo/db/service_context.h" |