diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-08-18 23:57:06 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2010-08-18 23:57:06 +0000 |
| commit | d44cd6adba6170f4915a731e2449962057b1cf26 (patch) | |
| tree | 362eaaf88c367865fb8253aba959cfb45ebf5268 /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 3e31c7249729aca534f0614d40f9b6398005579d (diff) | |
| download | bcm5719-llvm-d44cd6adba6170f4915a731e2449962057b1cf26.tar.gz bcm5719-llvm-d44cd6adba6170f4915a731e2449962057b1cf26.zip | |
More PCH -> AST renaming.
llvm-svn: 111472
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index cbaa6a3034b..b46212fedaf 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -40,13 +40,13 @@ void ASTMergeAction::ExecuteAction() { &CI.getASTContext()); llvm::IntrusiveRefCntPtr<Diagnostic> Diags(&CI.getDiagnostics()); for (unsigned I = 0, N = ASTFiles.size(); I != N; ++I) { - ASTUnit *Unit = ASTUnit::LoadFromPCHFile(ASTFiles[I], Diags, false); + ASTUnit *Unit = ASTUnit::LoadFromASTFile(ASTFiles[I], Diags, false); if (!Unit) continue; // Reset the argument -> string function so that it has the AST // context we want, since the Sema object created by - // LoadFromPCHFile will override it. + // LoadFromASTFile will override it. CI.getDiagnostics().SetArgToStringFn(&FormatASTNodeDiagnosticArgument, &CI.getASTContext()); |
