summaryrefslogtreecommitdiff
path: root/src/mongo/db/service_context.h
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-03-27 12:21:37 -0400
committerBilly Donahue <billy.donahue@mongodb.com>2019-03-28 10:13:21 -0400
commitf922827d45ce752e148185dfa3a785f7c9cf29fd (patch)
treeb3ae7fdba18d9ef3384af6e0d009d091e5df14a3 /src/mongo/db/service_context.h
parentf2f422d92b639edba0a10d40a43803723cb15baf (diff)
downloadmongo-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/service_context.h')
-rw-r--r--src/mongo/db/service_context.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/service_context.h b/src/mongo/db/service_context.h
index 5e54e8684d9..8a9741bcc42 100644
--- a/src/mongo/db/service_context.h
+++ b/src/mongo/db/service_context.h
@@ -33,7 +33,6 @@
#include <functional>
#include <vector>
-#include "mongo/base/disallow_copying.h"
#include "mongo/base/global_initializer_registerer.h"
#include "mongo/db/logical_session_id.h"
#include "mongo/db/storage/storage_engine.h"
@@ -70,7 +69,8 @@ class TransportLayer;
* including limitations on the lifetime of registered listeners.
*/
class KillOpListenerInterface {
- MONGO_DISALLOW_COPYING(KillOpListenerInterface);
+ KillOpListenerInterface(const KillOpListenerInterface&) = delete;
+ KillOpListenerInterface& operator=(const KillOpListenerInterface&) = delete;
public:
/**
@@ -95,7 +95,8 @@ protected:
* zero or more Clients, which in turn each own OperationContexts.
*/
class ServiceContext final : public Decorable<ServiceContext> {
- MONGO_DISALLOW_COPYING(ServiceContext);
+ ServiceContext(const ServiceContext&) = delete;
+ ServiceContext& operator=(const ServiceContext&) = delete;
public:
/**