SERVER-51061 Rename WHITELIST macros to ALLOW

11 files changed, 13 insertions, 16 deletions

diff --git a/src/mongo/base/checked_cast.h b/src/mongo/base/checked_cast.h
index 351874178f7..a7be37a2548 100644
--- a/src/mongo/base/checked_cast.h
+++ b/src/mongo/base/checked_cast.h
@@ -34,9 +34,9 @@
 
 #include "mongo/util/debug_util.h"
 
-#define MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#define MONGO_ALLOW_INCLUDE_INVARIANT_H
 #include "mongo/util/invariant.h"
-#undef MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#undef MONGO_ALLOW_INCLUDE_INVARIANT_H
 
 namespace mongo {
 
diff --git a/src/mongo/base/status_with.h b/src/mongo/base/status_with.h
index 22e6854c636..8279bc0afbf 100644
--- a/src/mongo/base/status_with.h
+++ b/src/mongo/base/status_with.h
@@ -38,9 +38,9 @@
 #include "mongo/base/status.h"
 #include "mongo/platform/compiler.h"
 
-#define MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#define MONGO_ALLOW_INCLUDE_INVARIANT_H
 #include "mongo/util/invariant.h"
-#undef MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#undef MONGO_ALLOW_INCLUDE_INVARIANT_H
 
 
 namespace mongo {
diff --git a/src/mongo/base/string_data.h b/src/mongo/base/string_data.h
index 1d0b7020644..fbadb26387b 100644
--- a/src/mongo/base/string_data.h
+++ b/src/mongo/base/string_data.h
@@ -41,9 +41,9 @@
 #include "mongo/platform/compiler.h"
 #include "mongo/stdx/type_traits.h"
 #include "mongo/util/ctype.h"
-#define MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#define MONGO_ALLOW_INCLUDE_INVARIANT_H
 #include "mongo/util/invariant.h"
-#undef MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#undef MONGO_ALLOW_INCLUDE_INVARIANT_H
 
 namespace mongo {
 
diff --git a/src/mongo/util/assert_util.h b/src/mongo/util/assert_util.h
index 4fc6d19174a..2b64163c6cb 100644
--- a/src/mongo/util/assert_util.h
+++ b/src/mongo/util/assert_util.h
@@ -41,9 +41,9 @@
 #include "mongo/util/debug_util.h"
 #include "mongo/util/exit_code.h"
 
-#define MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#define MONGO_ALLOW_INCLUDE_INVARIANT_H
 #include "mongo/util/invariant.h"
-#undef MONGO_INCLUDE_INVARIANT_H_WHITELISTED
+#undef MONGO_ALLOW_INCLUDE_INVARIANT_H
 
 namespace mongo {
 
diff --git a/src/mongo/util/dns_query.cpp b/src/mongo/util/dns_query.cpp
index d11c4268078..8858decdb13 100644
--- a/src/mongo/util/dns_query.cpp
+++ b/src/mongo/util/dns_query.cpp
@@ -48,7 +48,7 @@
 
 // It is safe to include the implementation "headers" in an anonymous namespace, as the code is
 // meant to live in a single TU -- this one.  Include one of these headers last.
-#define MONGO_UTIL_DNS_QUERY_PLATFORM_INCLUDE_WHITELIST
+#define MONGO_ALLOW_INCLUDE_UTIL_DNS_QUERY_PLATFORM
 #ifdef WIN32
 #include "mongo/util/dns_query_windows-impl.h"
 #elif defined(__ANDROID__) || defined(__EMSCRIPTEN__)
@@ -56,7 +56,7 @@
 #else
 #include "mongo/util/dns_query_posix-impl.h"
 #endif
-#undef MONGO_UTIL_DNS_QUERY_PLATFORM_INCLUDE_WHITELIST
+#undef MONGO_ALLOW_INCLUDE_UTIL_DNS_QUERY_PLATFORM
 
 using namespace std::literals::string_literals;
 
diff --git a/src/mongo/util/dns_query_posix-impl.h b/src/mongo/util/dns_query_posix-impl.h
index a5e36290f0f..8260154cf3a 100644
--- a/src/mongo/util/dns_query_posix-impl.h
+++ b/src/mongo/util/dns_query_posix-impl.h
@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#ifndef MONGO_UTIL_DNS_QUERY_PLATFORM_INCLUDE_WHITELIST
+#ifndef MONGO_ALLOW_INCLUDE_UTIL_DNS_QUERY_PLATFORM
 #error Do not include the DNS Query platform implementation headers.  Please use "mongo/util/dns_query.h" instead.
 #endif
 
diff --git a/src/mongo/util/dns_query_windows-impl.h b/src/mongo/util/dns_query_windows-impl.h
index 06c912ac304..226f45b7fd5 100644
--- a/src/mongo/util/dns_query_windows-impl.h
+++ b/src/mongo/util/dns_query_windows-impl.h
@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#ifndef MONGO_UTIL_DNS_QUERY_PLATFORM_INCLUDE_WHITELIST
+#ifndef MONGO_ALLOW_INCLUDE_UTIL_DNS_QUERY_PLATFORM
 #error Do not include the DNS Query platform implementation headers.  Please use "mongo/util/dns_query.h" instead.
 #endif
 
diff --git a/src/mongo/util/invariant.h b/src/mongo/util/invariant.h
index 4c7f967b567..dfaa0690fac 100644
--- a/src/mongo/util/invariant.h
+++ b/src/mongo/util/invariant.h
@@ -45,7 +45,7 @@ namespace mongo {
  * directly in any other files.
  */
 
-#if !defined(MONGO_INCLUDE_INVARIANT_H_WHITELISTED)
+#if !defined(MONGO_ALLOW_INCLUDE_INVARIANT_H)
 #error "Include assert_util.h instead of invariant.h."
 #endif
 
diff --git a/src/mongo/util/progress_meter.cpp b/src/mongo/util/progress_meter.cpp
index 3b737d47612..5a7fde9f3db 100644
--- a/src/mongo/util/progress_meter.cpp
+++ b/src/mongo/util/progress_meter.cpp
@@ -30,7 +30,6 @@
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 #include "mongo/platform/basic.h"
-#undef MONGO_PCH_WHITELISTED  // needed for log.h
 
 #include "mongo/util/progress_meter.h"
 
diff --git a/src/mongo/util/safe_num.cpp b/src/mongo/util/safe_num.cpp
index ba506c0d8ba..859e9a58704 100644
--- a/src/mongo/util/safe_num.cpp
+++ b/src/mongo/util/safe_num.cpp
@@ -30,7 +30,6 @@
 #include <sstream>
 
 #include "mongo/platform/basic.h"
-#undef MONGO_PCH_WHITELISTED  // for malloc/realloc/INFINITY pulled from bson
 
 #include "mongo/bson/bsontypes.h"
 #include "mongo/util/safe_num.h"
diff --git a/src/mongo/util/safe_num_test.cpp b/src/mongo/util/safe_num_test.cpp
index 7fb581b786f..90e324cd3c3 100644
--- a/src/mongo/util/safe_num_test.cpp
+++ b/src/mongo/util/safe_num_test.cpp
@@ -30,7 +30,6 @@
 #include <limits>
 
 #include "mongo/platform/basic.h"
-#undef MONGO_PCH_WHITELISTED  // for malloc/realloc pulled from bson
 
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsontypes.h"