SERVER-50917 util/ctype.h to replace <cctype> & <ctype.h> funcs

2 files changed, 5 insertions, 6 deletions

diff --git a/src/mongo/db/fts/fts_language.cpp b/src/mongo/db/fts/fts_language.cpp
index a2765d350d2..654817cd261 100644
--- a/src/mongo/db/fts/fts_language.cpp
+++ b/src/mongo/db/fts/fts_language.cpp
@@ -30,7 +30,6 @@
 #include "mongo/db/fts/fts_language.h"
 
 #include <algorithm>
-#include <cctype>
 #include <fmt/format.h>
 #include <map>
 #include <memory>
@@ -45,6 +44,7 @@
 #include "mongo/db/fts/fts_unicode_phrase_matcher.h"
 #include "mongo/db/fts/fts_unicode_tokenizer.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/ctype.h"
 
 namespace mongo::fts {
 
@@ -59,8 +59,8 @@ using namespace fmt::literals;
 struct LanguageStringCompare {
     bool operator()(StringData a, StringData b) const {
         return std::lexicographical_compare(
-            a.begin(), a.end(), b.begin(), b.end(), [](unsigned char a, unsigned char b) {
-                return std::tolower(a) < std::tolower(b);
+            a.begin(), a.end(), b.begin(), b.end(), [](char a, char b) {
+                return ctype::toLower(a) < ctype::toLower(b);
             });
     }
 };
diff --git a/src/mongo/db/fts/unicode/string_test.cpp b/src/mongo/db/fts/unicode/string_test.cpp
index a2943877b28..00931a22a10 100644
--- a/src/mongo/db/fts/unicode/string_test.cpp
+++ b/src/mongo/db/fts/unicode/string_test.cpp
@@ -29,11 +29,10 @@
 
 #include "mongo/platform/basic.h"
 
-#include <cctype>
-
 #include "mongo/db/fts/unicode/string.h"
 #include "mongo/shell/linenoise_utf8.h"
 #include "mongo/unittest/unittest.h"
+#include "mongo/util/ctype.h"
 #include "mongo/util/text.h"
 
 #ifdef MSC_VER
@@ -114,7 +113,7 @@ TEST(UnicodeString, CaseFolding) {
     // Test all ascii chars.
     for (unsigned char ch = 0; ch <= 0x7F; ch++) {
         const auto upper = std::string(1, ch);
-        const auto lower = std::string(1, std::tolower(ch));
+        const auto lower = std::string(1, ctype::toLower(ch));
         if (ch) {  // String's constructor doesn't handle embedded NUL bytes.
             ASSERT_EQUALS(lower, String(upper).toLowerToBuf(&buf, kNormal));
         }