diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2019-01-09 17:32:12 -0500 |
|---|---|---|
| committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-01-11 10:50:23 -0500 |
| commit | bbf28648de0d8695c502e13922a8d9e5ca1b51e8 (patch) | |
| tree | 6382810d03fb698d9b2d49f488be90e604324811 /src/mongo/db/operation_context.cpp | |
| parent | 17514947cc816df2500aa0e919506586d4d56aa0 (diff) | |
| download | mongo-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/operation_context.cpp')
| -rw-r--r-- | src/mongo/db/operation_context.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/operation_context.cpp b/src/mongo/db/operation_context.cpp index 88af8855212..87080f39195 100644 --- a/src/mongo/db/operation_context.cpp +++ b/src/mongo/db/operation_context.cpp @@ -327,7 +327,7 @@ void OperationContext::markKilled(ErrorCodes::Error killCode) { if (_waitMutex) { invariant(++_numKillers > 0); getClient()->unlock(); - ON_BLOCK_EXIT([this]() noexcept { + ON_BLOCK_EXIT([this] { getClient()->lock(); invariant(--_numKillers >= 0); }); |