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/commands/create_indexes.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/commands/create_indexes.cpp')
| -rw-r--r-- | src/mongo/db/commands/create_indexes.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp index c1bed1a0dd2..f6169d8f858 100644 --- a/src/mongo/db/commands/create_indexes.cpp +++ b/src/mongo/db/commands/create_indexes.cpp @@ -390,7 +390,7 @@ bool runCreateIndexes(OperationContext* opCtx, dbLock.relockWithMode(MODE_IX); } - auto relockOnErrorGuard = MakeGuard([&] { + auto relockOnErrorGuard = makeGuard([&] { // Must have exclusive DB lock before we clean up the index build via the // destructor of 'indexer'. if (indexer.getBuildInBackground()) { @@ -443,7 +443,7 @@ bool runCreateIndexes(OperationContext* opCtx, MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangAfterIndexBuildSecondDrain); } - relockOnErrorGuard.Dismiss(); + relockOnErrorGuard.dismiss(); // Need to return db lock back to exclusive, to complete the index build. if (indexer.getBuildInBackground()) { |