aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Frontend/ASTMerge.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2014-08-10 19:08:04 +0000
committerDavid Blaikie <dblaikie@gmail.com>2014-08-10 19:08:04 +0000
commit6f7382ddd11db36df6b7f08324134ec1a54e0a5e (patch)
tree7e48396093f2d07d702e14ebb2eaac3e7871dafc /clang/lib/Frontend/ASTMerge.cpp
parentf62d4e772d7ea782ed2335639bd3f9c5c7b217f1 (diff)
downloadllvm-6f7382ddd11db36df6b7f08324134ec1a54e0a5e.zip
llvm-6f7382ddd11db36df6b7f08324134ec1a54e0a5e.tar.gz
llvm-6f7382ddd11db36df6b7f08324134ec1a54e0a5e.tar.bz2
std::unique_ptr-ify the result of ASTUnit::LoadFromASTFile
llvm-svn: 215320
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
-rw-r--r--clang/lib/Frontend/ASTMerge.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp
index ff6434c..95cfe248 100644
--- a/clang/lib/Frontend/ASTMerge.cpp
+++ b/clang/lib/Frontend/ASTMerge.cpp
@@ -45,8 +45,8 @@ void ASTMergeAction::ExecuteAction() {
new ForwardingDiagnosticConsumer(
*CI.getDiagnostics().getClient()),
/*ShouldOwnClient=*/true));
- ASTUnit *Unit = ASTUnit::LoadFromASTFile(ASTFiles[I], Diags,
- CI.getFileSystemOpts(), false);
+ std::unique_ptr<ASTUnit> Unit = ASTUnit::LoadFromASTFile(
+ ASTFiles[I], Diags, CI.getFileSystemOpts(), false);
if (!Unit)
continue;
@@ -66,8 +66,6 @@ void ASTMergeAction::ExecuteAction() {
Importer.Import(D);
}
-
- delete Unit;
}
AdaptedAction->ExecuteAction();