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/platform/stack_locator_freebsd.cpp b/src/mongo/platform/stack_locator_freebsd.cpp
index 6020eed4f06..beb1e805fcb 100644
--- a/src/mongo/platform/stack_locator_freebsd.cpp
+++ b/src/mongo/platform/stack_locator_freebsd.cpp
@@ -47,7 +47,7 @@ StackLocator::StackLocator() {
     pthread_t self = pthread_self();
 
     invariant(pthread_attr_init(&attr) == 0);
-    ON_BLOCK_EXIT(pthread_attr_destroy, &attr);
+    ON_BLOCK_EXIT([&] { pthread_attr_destroy(&attr); });
 
     invariant(pthread_attr_get_np(self, &attr) == 0);
 
diff --git a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp
index 88d5bf1c846..72542b560d8 100644
--- a/src/mongo/platform/stack_locator_pthread_getattr_np.cpp
+++ b/src/mongo/platform/stack_locator_pthread_getattr_np.cpp
@@ -44,7 +44,7 @@ StackLocator::StackLocator() {
     pthread_attr_t selfAttrs;
     invariant(pthread_attr_init(&selfAttrs) == 0);
     invariant(pthread_getattr_np(self, &selfAttrs) == 0);
-    ON_BLOCK_EXIT(pthread_attr_destroy, &selfAttrs);
+    ON_BLOCK_EXIT([&] { pthread_attr_destroy(&selfAttrs); });
 
     void* base = nullptr;
     size_t size = 0;