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/bson/bsonelement.cpp b/src/mongo/bson/bsonelement.cpp
index caa2af3f879..b87de5f5d26 100644
--- a/src/mongo/bson/bsonelement.cpp
+++ b/src/mongo/bson/bsonelement.cpp
@@ -93,7 +93,7 @@ void BSONElement::jsonStringStream(JsonStringFormat format,
             if (number() >= -std::numeric_limits<double>::max() &&
                 number() <= std::numeric_limits<double>::max()) {
                 auto origPrecision = s.precision();
-                auto guard = MakeGuard([&s, origPrecision]() { s.precision(origPrecision); });
+                auto guard = makeGuard([&s, origPrecision]() { s.precision(origPrecision); });
                 s.precision(16);
                 s << number();
             }
@@ -217,7 +217,7 @@ void BSONElement::jsonStringStream(JsonStringFormat format,
             auto origFill = s.fill();
             auto origFmtF = s.flags();
             auto origWidth = s.width();
-            auto guard = MakeGuard([&s, origFill, origFmtF, origWidth] {
+            auto guard = makeGuard([&s, origFill, origFmtF, origWidth] {
                 s.fill(origFill);
                 s.setf(origFmtF);
                 s.width(origWidth);