diff options
| author | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-09-06 18:36:24 +0000 |
| commit | 4238dc458ed9a048965af111b979fd51d288f22c (patch) | |
| tree | 3d3ed1e1987dbe6444294b1b4e249814b97b97a5 /lib/Frontend/ASTMerge.cpp | |
| parent | 6416b56f5a3923c6c264b46365e16718ccabf081 (diff) | |
| download | FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.zip FreeBSD-src-4238dc458ed9a048965af111b979fd51d288f22c.tar.gz | |
Import clang 3.7.0 release (r246257).
Diffstat (limited to 'lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | lib/Frontend/ASTMerge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Frontend/ASTMerge.cpp b/lib/Frontend/ASTMerge.cpp index f6f1551..762c7a5 100644 --- a/lib/Frontend/ASTMerge.cpp +++ b/lib/Frontend/ASTMerge.cpp @@ -46,7 +46,7 @@ void ASTMergeAction::ExecuteAction() { *CI.getDiagnostics().getClient()), /*ShouldOwnClient=*/true)); std::unique_ptr<ASTUnit> Unit = - ASTUnit::LoadFromASTFile(ASTFiles[I], CI.getPCHContainerOperations(), + ASTUnit::LoadFromASTFile(ASTFiles[I], CI.getPCHContainerReader(), Diags, CI.getFileSystemOpts(), false); if (!Unit) |
