diff options
| author | 2017-01-14 19:55:43 +0000 | |
|---|---|---|
| committer | 2017-01-14 19:55:43 +0000 | |
| commit | bd3306aecb3a15e8967143b8cdbbccf2b1b19b74 (patch) | |
| tree | 309a8132b44564b9e634c0da6815187ce8eab27c /gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp | |
| parent | killp -a should not kill the window if only one pane. (diff) | |
| download | wireguard-openbsd-bd3306aecb3a15e8967143b8cdbbccf2b1b19b74.tar.xz wireguard-openbsd-bd3306aecb3a15e8967143b8cdbbccf2b1b19b74.zip | |
Import LLVM 3.9.1 including clang and lld.
Diffstat (limited to 'gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp b/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp index b499fa2b0e6..51064da270c 100644 --- a/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp +++ b/gnu/llvm/tools/clang/lib/Frontend/ASTMerge.cpp @@ -83,14 +83,13 @@ void ASTMergeAction::EndSourceFileAction() { return AdaptedAction->EndSourceFileAction(); } -ASTMergeAction::ASTMergeAction(FrontendAction *AdaptedAction, +ASTMergeAction::ASTMergeAction(std::unique_ptr<FrontendAction> adaptedAction, ArrayRef<std::string> ASTFiles) - : AdaptedAction(AdaptedAction), ASTFiles(ASTFiles.begin(), ASTFiles.end()) { +: AdaptedAction(std::move(adaptedAction)), ASTFiles(ASTFiles.begin(), ASTFiles.end()) { assert(AdaptedAction && "ASTMergeAction needs an action to adapt"); } ASTMergeAction::~ASTMergeAction() { - delete AdaptedAction; } bool ASTMergeAction::usesPreprocessorOnly() const { |
