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/catalog/rename_collection.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/catalog/rename_collection.cpp')
| -rw-r--r-- | src/mongo/db/catalog/rename_collection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp index 0d05cd8c227..c0bb212b6dd 100644 --- a/src/mongo/db/catalog/rename_collection.cpp +++ b/src/mongo/db/catalog/rename_collection.cpp @@ -411,7 +411,7 @@ Status renameCollectionCommon(OperationContext* opCtx, } // Dismissed on success - auto tmpCollectionDropper = MakeGuard([&] { + auto tmpCollectionDropper = makeGuard([&] { BSONObjBuilder unusedResult; Status status = Status::OK(); try { @@ -563,7 +563,7 @@ Status renameCollectionCommon(OperationContext* opCtx, if (!status.isOK()) { return status; } - tmpCollectionDropper.Dismiss(); + tmpCollectionDropper.dismiss(); BSONObjBuilder unusedResult; return dropCollection(opCtx, |