diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-01-20 16:28:04 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-01-20 16:28:04 +0000 |
| commit | 32fbe31246fa498c4170411dfda3ae85b7c39c4e (patch) | |
| tree | 22b7aa0b9b223a4ae57b1fc8ae656357eaba9ee2 /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 469214426ac525c12ec83d6a3b2e86f0ded1e57f (diff) | |
| download | bcm5719-llvm-32fbe31246fa498c4170411dfda3ae85b7c39c4e.tar.gz bcm5719-llvm-32fbe31246fa498c4170411dfda3ae85b7c39c4e.zip | |
Extract the (InputKind, std::string) pair used to describe inputs to
the front end into its own class, FrontendInputFile, to make it easier
to introduce new per-input data. No functionality change.
llvm-svn: 148546
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index cb195d11fbc..a4104115f20 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -26,8 +26,7 @@ bool ASTMergeAction::BeginSourceFileAction(CompilerInstance &CI, // FIXME: This is a hack. We need a better way to communicate the // AST file, compiler instance, and file name than member variables // of FrontendAction. - AdaptedAction->setCurrentFile(getCurrentFile(), getCurrentFileKind(), - takeCurrentASTUnit()); + AdaptedAction->setCurrentInput(getCurrentInput(), takeCurrentASTUnit()); AdaptedAction->setCompilerInstance(&CI); return AdaptedAction->BeginSourceFileAction(CI, Filename); } |
