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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/mongo/util/decoration_registry.h b/src/mongo/util/decoration_registry.h
index 921d8f9b009..6f852b387e2 100644
--- a/src/mongo/util/decoration_registry.h
+++ b/src/mongo/util/decoration_registry.h
@@ -100,7 +100,7 @@ public:
                           });
         };
 
-        auto cleanup = MakeGuard(std::move(cleanupFunction));
+        auto cleanup = makeGuard(std::move(cleanupFunction));
 
         using std::cend;
 
@@ -108,7 +108,7 @@ public:
             iter->constructor(container->getDecoration(iter->descriptor));
         }
 
-        cleanup.Dismiss();
+        cleanup.dismiss();
     }
 
     /**