summaryrefslogtreecommitdiff
path: root/src/mongo/db/commands/user_management_commands.cpp
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-01-09 17:32:12 -0500
committerBilly Donahue <billy.donahue@mongodb.com>2019-01-11 10:50:23 -0500
commitbbf28648de0d8695c502e13922a8d9e5ca1b51e8 (patch)
tree6382810d03fb698d9b2d49f488be90e604324811 /src/mongo/db/commands/user_management_commands.cpp
parent17514947cc816df2500aa0e919506586d4d56aa0 (diff)
downloadmongo-bbf28648de0d8695c502e13922a8d9e5ca1b51e8.tar.gz
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
Diffstat (limited to 'src/mongo/db/commands/user_management_commands.cpp')
-rw-r--r--src/mongo/db/commands/user_management_commands.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp
index df1d33ba54f..f1cd1574494 100644
--- a/src/mongo/db/commands/user_management_commands.cpp
+++ b/src/mongo/db/commands/user_management_commands.cpp
@@ -1981,7 +1981,7 @@ public:
uassertStatusOK(status);
// From here on, we always want to invalidate the user cache before returning.
- auto invalidateGuard = MakeGuard([&] {
+ auto invalidateGuard = makeGuard([&] {
try {
authzManager->invalidateUserCache(opCtx);
} catch (const DBException& e) {
@@ -2102,7 +2102,7 @@ public:
auto lk = uassertStatusOK(requireWritableAuthSchema28SCRAM(opCtx, authzManager));
// From here on, we always want to invalidate the user cache before returning.
- auto invalidateGuard = MakeGuard([&] {
+ auto invalidateGuard = makeGuard([&] {
try {
authzManager->invalidateUserCache(opCtx);
} catch (const DBException& e) {
@@ -2712,7 +2712,7 @@ public:
auto lk = uassertStatusOK(requireWritableAuthSchema28SCRAM(opCtx, authzManager));
// From here on, we always want to invalidate the user cache before returning.
- auto invalidateGuard = MakeGuard([&] {
+ auto invalidateGuard = makeGuard([&] {
try {
authzManager->invalidateUserCache(opCtx);
} catch (const DBException& e) {