diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2021-09-03 19:11:40 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-08 07:54:48 +0000 |
| commit | c90f38192378c8526354465991830524eda90c1f (patch) | |
| tree | 73ce6a76f4dc6f8eaa206309becf5881aaf20a32 /src/mongo/db/exec | |
| parent | a0a0d7eecccf38f028a77c4cc8b0f13f8673f675 (diff) | |
| download | mongo-c90f38192378c8526354465991830524eda90c1f.tar.gz | |
SERVER-59782 migrate makeGuard calls to ScopeGuard
Diffstat (limited to 'src/mongo/db/exec')
| -rw-r--r-- | src/mongo/db/exec/delete.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/exec/js_function.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/exec/update_stage.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/exec/delete.cpp b/src/mongo/db/exec/delete.cpp index b5095bb8eda..8cc3c5fafb6 100644 --- a/src/mongo/db/exec/delete.cpp +++ b/src/mongo/db/exec/delete.cpp @@ -139,7 +139,7 @@ PlanStage::StageState DeleteStage::doWork(WorkingSetID* out) { WorkingSetMember* member = _ws->get(id); // We want to free this member when we return, unless we need to retry deleting or returning it. - auto memberFreer = makeGuard([&] { _ws->free(id); }); + ScopeGuard memberFreer([&] { _ws->free(id); }); invariant(member->hasRecordId()); RecordId recordId = member->recordId; diff --git a/src/mongo/db/exec/js_function.cpp b/src/mongo/db/exec/js_function.cpp index ae6e479c521..58e3a880b00 100644 --- a/src/mongo/db/exec/js_function.cpp +++ b/src/mongo/db/exec/js_function.cpp @@ -64,7 +64,7 @@ JsFunction::JsFunction(OperationContext* opCtx, const auto userToken = getAuthenticatedUserNamesToken(opCtx->getClient()); _scope = getGlobalScriptEngine()->getPooledScope(opCtx, dbName, "where" + userToken); - const auto guard = makeGuard([&] { _scope->unregisterOperation(); }); + const ScopeGuard guard([&] { _scope->unregisterOperation(); }); _func = _scope->createFunction(code.c_str()); uassert(ErrorCodes::BadValue, "$where compile error", _func); @@ -72,7 +72,7 @@ JsFunction::JsFunction(OperationContext* opCtx, bool JsFunction::runAsPredicate(const BSONObj& obj) const { _scope->registerOperation(Client::getCurrent()->getOperationContext()); - const auto scopeOpCtxGuard = makeGuard([&] { _scope->unregisterOperation(); }); + const ScopeGuard scopeOpCtxGuard([&] { _scope->unregisterOperation(); }); _scope->advanceGeneration(); _scope->setObject("obj", obj); diff --git a/src/mongo/db/exec/update_stage.cpp b/src/mongo/db/exec/update_stage.cpp index 708c25dfe30..5859e85e72f 100644 --- a/src/mongo/db/exec/update_stage.cpp +++ b/src/mongo/db/exec/update_stage.cpp @@ -402,7 +402,7 @@ PlanStage::StageState UpdateStage::doWork(WorkingSetID* out) { // We want to free this member when we return, unless we need to retry updating or returning // it. - auto memberFreer = makeGuard([&] { _ws->free(id); }); + ScopeGuard memberFreer([&] { _ws->free(id); }); invariant(member->hasRecordId()); recordId = member->recordId; |