SERVER-30711: scope_guard rewrite, to avoid -Werror=noexcept-type

    Macro ON_BLOCK_EXIT(...) now takes a single callable,

    Some renames:
        Dismias -> dismiss
        MakeGuard => makeGuard

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/rpc/metadata/client_metadata_test.cpp b/src/mongo/rpc/metadata/client_metadata_test.cpp
index fd02aee23c3..30985af8b3c 100644
--- a/src/mongo/rpc/metadata/client_metadata_test.cpp
+++ b/src/mongo/rpc/metadata/client_metadata_test.cpp
@@ -257,7 +257,7 @@ TEST(ClientMetadatTest, TestNegativeWrongTypes) {
 // Negative: document larger than 512 bytes
 TEST(ClientMetadatTest, TestNegativeLargeDocument) {
     bool savedMongos = isMongos();
-    auto unsetMongoS = MakeGuard(&setMongos, savedMongos);
+    auto unsetMongoS = makeGuard([&] { setMongos(savedMongos); });
 
     setMongos(true);
     {
diff --git a/src/mongo/rpc/object_check_test.cpp b/src/mongo/rpc/object_check_test.cpp
index f9d96f7f242..80e3e179fbc 100644
--- a/src/mongo/rpc/object_check_test.cpp
+++ b/src/mongo/rpc/object_check_test.cpp
@@ -48,7 +48,7 @@ TEST(DataTypeValidated, BSONValidationEnabled) {
 
     bool wasEnabled = serverGlobalParams.objcheck;
     const auto setValidation = [&](bool enabled) { serverGlobalParams.objcheck = enabled; };
-    ON_BLOCK_EXIT(setValidation, wasEnabled);
+    ON_BLOCK_EXIT([=] { setValidation(wasEnabled); });
 
     using std::begin;
     using std::end;