Skip to content

Commit 61c661f

Browse files
committed
Revert use of scope_exit
1 parent d845433 commit 61c661f

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

Framework/AnalysisSupport/src/DataInputDirector.cxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <arrow/dataset/dataset.h>
3636
#include <uv.h>
3737
#include <exception>
38-
#include <experimental/scope>
3938
#include <memory>
4039

4140
#if __has_include(<TJAlienFile.h>)
@@ -580,13 +579,13 @@ bool DataInputDescriptor::readTree(DataAllocator& outputs, header::DataHeader dh
580579
//// add branches to read
581580
//// fill the table
582581
f2b->setLabel(treename.c_str());
583-
std::experimental::scope_exit discardOnError{[&f2b] { f2b.discard(); }};
584582
char const* operation = "read";
585583
try {
586584
f2b->fill(datasetSchema, format);
587585
operation = "finalize";
588586
f2b.release();
589587
} catch (...) {
588+
f2b.discard();
590589
std::throw_with_nested(InvalidAODReadError(fmt::format("Unable to {} tree {}", operation, treename)));
591590
}
592591

0 commit comments

Comments
 (0)