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

5 files changed, 12 insertions, 7 deletions

diff --git a/src/mongo/scripting/bson_template_evaluator.h b/src/mongo/scripting/bson_template_evaluator.h
index 9835a7d04b8..6d2f0565790 100644
--- a/src/mongo/scripting/bson_template_evaluator.h
+++ b/src/mongo/scripting/bson_template_evaluator.h
@@ -74,7 +74,8 @@ namespace mongo {
  *
  */
 class BsonTemplateEvaluator {
-    MONGO_DISALLOW_COPYING(BsonTemplateEvaluator);
+    BsonTemplateEvaluator(const BsonTemplateEvaluator&) = delete;
+    BsonTemplateEvaluator& operator=(const BsonTemplateEvaluator&) = delete;
 
 public:
     /* Status of template evaluation. Logically the  the status are "success", "bad operator"
diff --git a/src/mongo/scripting/deadline_monitor.h b/src/mongo/scripting/deadline_monitor.h
index 2d33f1740de..03abfcbdac6 100644
--- a/src/mongo/scripting/deadline_monitor.h
+++ b/src/mongo/scripting/deadline_monitor.h
@@ -30,7 +30,6 @@
 
 #include <cstdint>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/stdx/condition_variable.h"
 #include "mongo/stdx/mutex.h"
@@ -70,7 +69,8 @@ int getScriptingEngineInterruptInterval();
  */
 template <typename _Task>
 class DeadlineMonitor {
-    MONGO_DISALLOW_COPYING(DeadlineMonitor);
+    DeadlineMonitor(const DeadlineMonitor&) = delete;
+    DeadlineMonitor& operator=(const DeadlineMonitor&) = delete;
 
 public:
     DeadlineMonitor() {
diff --git a/src/mongo/scripting/engine.h b/src/mongo/scripting/engine.h
index 9f2dd08e7b4..f5a85d44f3e 100644
--- a/src/mongo/scripting/engine.h
+++ b/src/mongo/scripting/engine.h
@@ -47,7 +47,8 @@ struct JSFile {
 };
 
 class Scope {
-    MONGO_DISALLOW_COPYING(Scope);
+    Scope(const Scope&) = delete;
+    Scope& operator=(const Scope&) = delete;
 
 public:
     Scope();
@@ -204,7 +205,8 @@ protected:
 };
 
 class ScriptEngine : public KillOpListenerInterface {
-    MONGO_DISALLOW_COPYING(ScriptEngine);
+    ScriptEngine(const ScriptEngine&) = delete;
+    ScriptEngine& operator=(const ScriptEngine&) = delete;
 
 public:
     ScriptEngine();
diff --git a/src/mongo/scripting/mozjs/implscope.h b/src/mongo/scripting/mozjs/implscope.h
index 36ff29f9678..b0eb7c55c14 100644
--- a/src/mongo/scripting/mozjs/implscope.h
+++ b/src/mongo/scripting/mozjs/implscope.h
@@ -84,7 +84,8 @@ namespace mozjs {
  * For more information about overriden fields, see mongo::Scope
  */
 class MozJSImplScope final : public Scope {
-    MONGO_DISALLOW_COPYING(MozJSImplScope);
+    MozJSImplScope(const MozJSImplScope&) = delete;
+    MozJSImplScope& operator=(const MozJSImplScope&) = delete;
 
 public:
     explicit MozJSImplScope(MozJSScriptEngine* engine);
diff --git a/src/mongo/scripting/mozjs/proxyscope.h b/src/mongo/scripting/mozjs/proxyscope.h
index ddaa9c815ec..9d11a857923 100644
--- a/src/mongo/scripting/mozjs/proxyscope.h
+++ b/src/mongo/scripting/mozjs/proxyscope.h
@@ -63,7 +63,8 @@ class MozJSImplScope;
  *
  */
 class MozJSProxyScope final : public Scope {
-    MONGO_DISALLOW_COPYING(MozJSProxyScope);
+    MozJSProxyScope(const MozJSProxyScope&) = delete;
+    MozJSProxyScope& operator=(const MozJSProxyScope&) = delete;
 
     /**
      * The FSM is fairly tight: