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

11 files changed, 20 insertions, 16 deletions

diff --git a/src/mongo/db/fts/fts_basic_phrase_matcher.h b/src/mongo/db/fts/fts_basic_phrase_matcher.h
index 3784b50e616..dfab41a6119 100644
--- a/src/mongo/db/fts/fts_basic_phrase_matcher.h
+++ b/src/mongo/db/fts/fts_basic_phrase_matcher.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/fts/fts_phrase_matcher.h"
 
 namespace mongo {
@@ -41,7 +40,8 @@ namespace fts {
  * operations are inherently diacritic sensitive.
  */
 class BasicFTSPhraseMatcher final : public FTSPhraseMatcher {
-    MONGO_DISALLOW_COPYING(BasicFTSPhraseMatcher);
+    BasicFTSPhraseMatcher(const BasicFTSPhraseMatcher&) = delete;
+    BasicFTSPhraseMatcher& operator=(const BasicFTSPhraseMatcher&) = delete;
 
 public:
     BasicFTSPhraseMatcher() = default;
diff --git a/src/mongo/db/fts/fts_basic_tokenizer.h b/src/mongo/db/fts/fts_basic_tokenizer.h
index c9f8f61e0ec..d3f7851034e 100644
--- a/src/mongo/db/fts/fts_basic_tokenizer.h
+++ b/src/mongo/db/fts/fts_basic_tokenizer.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/fts/fts_tokenizer.h"
 #include "mongo/db/fts/stemmer.h"
@@ -58,7 +57,8 @@ class StopWords;
  * generated by the BasicFTSTokenizer are ineherently diacritic sensitive.
  */
 class BasicFTSTokenizer final : public FTSTokenizer {
-    MONGO_DISALLOW_COPYING(BasicFTSTokenizer);
+    BasicFTSTokenizer(const BasicFTSTokenizer&) = delete;
+    BasicFTSTokenizer& operator=(const BasicFTSTokenizer&) = delete;
 
 public:
     BasicFTSTokenizer(const FTSLanguage* language);
diff --git a/src/mongo/db/fts/fts_language.h b/src/mongo/db/fts/fts_language.h
index a15adedb8e1..47a6ab2213d 100644
--- a/src/mongo/db/fts/fts_language.h
+++ b/src/mongo/db/fts/fts_language.h
@@ -69,7 +69,8 @@ class FTSTokenizer;
  */
 class FTSLanguage {
     // Use make() instead of copying.
-    MONGO_DISALLOW_COPYING(FTSLanguage);
+    FTSLanguage(const FTSLanguage&) = delete;
+    FTSLanguage& operator=(const FTSLanguage&) = delete;
 
 public:
     /** Create an uninitialized language. */
diff --git a/src/mongo/db/fts/fts_matcher.h b/src/mongo/db/fts/fts_matcher.h
index 91eecf0d7e5..5dbcc981109 100644
--- a/src/mongo/db/fts/fts_matcher.h
+++ b/src/mongo/db/fts/fts_matcher.h
@@ -39,7 +39,8 @@ namespace mongo {
 namespace fts {
 
 class FTSMatcher {
-    MONGO_DISALLOW_COPYING(FTSMatcher);
+    FTSMatcher(const FTSMatcher&) = delete;
+    FTSMatcher& operator=(const FTSMatcher&) = delete;
 
 public:
     FTSMatcher(const FTSQueryImpl& query, const FTSSpec& spec);
diff --git a/src/mongo/db/fts/fts_query_parser.h b/src/mongo/db/fts/fts_query_parser.h
index f607cef719c..f4bab3e7e1c 100644
--- a/src/mongo/db/fts/fts_query_parser.h
+++ b/src/mongo/db/fts/fts_query_parser.h
@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
 
 namespace mongo {
@@ -69,7 +68,8 @@ struct QueryToken {
  * SPECIAL_CHARS = '-' | ' ' | '"'
  */
 class FTSQueryParser {
-    MONGO_DISALLOW_COPYING(FTSQueryParser);
+    FTSQueryParser(const FTSQueryParser&) = delete;
+    FTSQueryParser& operator=(const FTSQueryParser&) = delete;
 
 public:
     FTSQueryParser(StringData str);
diff --git a/src/mongo/db/fts/fts_tokenizer.h b/src/mongo/db/fts/fts_tokenizer.h
index 8d2c08727a1..cae883b7b09 100644
--- a/src/mongo/db/fts/fts_tokenizer.h
+++ b/src/mongo/db/fts/fts_tokenizer.h
@@ -32,7 +32,6 @@
 
 #include <cstdint>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
 
 namespace mongo {
diff --git a/src/mongo/db/fts/fts_unicode_phrase_matcher.h b/src/mongo/db/fts/fts_unicode_phrase_matcher.h
index bf3d16b71aa..de3ad3c11c8 100644
--- a/src/mongo/db/fts/fts_unicode_phrase_matcher.h
+++ b/src/mongo/db/fts/fts_unicode_phrase_matcher.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/fts/fts_phrase_matcher.h"
 #include "mongo/db/fts/unicode/codepoints.h"
 
@@ -48,7 +47,8 @@ class FTSLanguage;
  * case fold mapping), the phrase matcher will take that into account.
  */
 class UnicodeFTSPhraseMatcher final : public FTSPhraseMatcher {
-    MONGO_DISALLOW_COPYING(UnicodeFTSPhraseMatcher);
+    UnicodeFTSPhraseMatcher(const UnicodeFTSPhraseMatcher&) = delete;
+    UnicodeFTSPhraseMatcher& operator=(const UnicodeFTSPhraseMatcher&) = delete;
 
 public:
     UnicodeFTSPhraseMatcher(const std::string& language);
diff --git a/src/mongo/db/fts/fts_unicode_tokenizer.h b/src/mongo/db/fts/fts_unicode_tokenizer.h
index cededf1e4b7..0745e11ad07 100644
--- a/src/mongo/db/fts/fts_unicode_tokenizer.h
+++ b/src/mongo/db/fts/fts_unicode_tokenizer.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/string_data.h"
 #include "mongo/db/fts/fts_tokenizer.h"
 #include "mongo/db/fts/stemmer.h"
@@ -56,7 +55,8 @@ class StopWords;
  * Optionally supports returning case sensitive search terms.
  */
 class UnicodeFTSTokenizer final : public FTSTokenizer {
-    MONGO_DISALLOW_COPYING(UnicodeFTSTokenizer);
+    UnicodeFTSTokenizer(const UnicodeFTSTokenizer&) = delete;
+    UnicodeFTSTokenizer& operator=(const UnicodeFTSTokenizer&) = delete;
 
 public:
     UnicodeFTSTokenizer(const FTSLanguage* language);
diff --git a/src/mongo/db/fts/stemmer.h b/src/mongo/db/fts/stemmer.h
index e5b7d3c1158..a5a15174a94 100644
--- a/src/mongo/db/fts/stemmer.h
+++ b/src/mongo/db/fts/stemmer.h
@@ -44,7 +44,8 @@ namespace fts {
  * running/Running -> run/Run
  */
 class Stemmer {
-    MONGO_DISALLOW_COPYING(Stemmer);
+    Stemmer(const Stemmer&) = delete;
+    Stemmer& operator=(const Stemmer&) = delete;
 
 public:
     Stemmer(const FTSLanguage* language);
diff --git a/src/mongo/db/fts/stop_words.h b/src/mongo/db/fts/stop_words.h
index 81d683aec8d..22835300226 100644
--- a/src/mongo/db/fts/stop_words.h
+++ b/src/mongo/db/fts/stop_words.h
@@ -41,7 +41,8 @@ namespace mongo {
 namespace fts {
 
 class StopWords {
-    MONGO_DISALLOW_COPYING(StopWords);
+    StopWords(const StopWords&) = delete;
+    StopWords& operator=(const StopWords&) = delete;
 
 public:
     StopWords();
diff --git a/src/mongo/db/fts/tokenizer.h b/src/mongo/db/fts/tokenizer.h
index 68b8afb2881..1a0e79d9425 100644
--- a/src/mongo/db/fts/tokenizer.h
+++ b/src/mongo/db/fts/tokenizer.h
@@ -53,7 +53,8 @@ struct Token {
 };
 
 class Tokenizer {
-    MONGO_DISALLOW_COPYING(Tokenizer);
+    Tokenizer(const Tokenizer&) = delete;
+    Tokenizer& operator=(const Tokenizer&) = delete;
 
 public:
     Tokenizer(const FTSLanguage* language, StringData str);