SERVER-44185 Convert keyStringAssert() and keyStringAsserted() into a macro to avoid evaluating parameters early

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mongo/db/storage/key_string.cpp b/src/mongo/db/storage/key_string.cpp
index e9e47cbf6fa..bd796938714 100644
--- a/src/mongo/db/storage/key_string.cpp
+++ b/src/mongo/db/storage/key_string.cpp
@@ -45,6 +45,11 @@
 #include "mongo/util/hex.h"
 #include "mongo/util/log.h"
 
+#define keyStringAssert(msgid, msg, expr) \
+    uassert(msgid, str::stream() << "KeyString format error: " << msg, expr)
+#define keyStringAsserted(msgid, msg) \
+    uasserted(msgid, str::stream() << "KeyString format error: " << msg)
+
 namespace mongo {
 
 using std::string;
@@ -234,14 +239,6 @@ const uint8_t kGreater = 254;
 // some utility functions
 namespace {
 
-void keyStringAssert(const int msgid, const std::string msg, const bool expr) {
-    uassert(msgid, str::stream() << "KeyString format error: " << msg, expr);
-}
-
-void keyStringAsserted(const int msgid, const std::string msg) {
-    uasserted(msgid, str::stream() << "KeyString format error: " << msg);
-}
-
 void memcpy_flipBits(void* dst, const void* src, size_t bytes) {
     const char* input = static_cast<const char*>(src);
     char* output = static_cast<char*>(dst);