diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-11-23 08:35:12 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-11-23 08:35:12 +0000 |
| commit | 5159f6162e894deedb0be1ab53e3e0f823c9db5d (patch) | |
| tree | 6ad37aa5c3f6564eb01bc7a75e0749e9b7829204 /clang/lib/Frontend/ASTMerge.cpp | |
| parent | 5c1d4e3b1ea05949052737e5cdf11ef228231543 (diff) | |
| download | llvm-5159f6162e894deedb0be1ab53e3e0f823c9db5d.zip llvm-5159f6162e894deedb0be1ab53e3e0f823c9db5d.tar.gz llvm-5159f6162e894deedb0be1ab53e3e0f823c9db5d.tar.bz2 | |
now the FileManager has a FileSystemOpts ivar, stop threading
FileSystemOpts through a ton of apis, simplifying a lot of code.
This also fixes a latent bug in ASTUnit where it would invoke
methods on FileManager without creating one in some code paths
in cindextext.
llvm-svn: 120010
Diffstat (limited to 'clang/lib/Frontend/ASTMerge.cpp')
| -rw-r--r-- | clang/lib/Frontend/ASTMerge.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Frontend/ASTMerge.cpp b/clang/lib/Frontend/ASTMerge.cpp index d4ed8d3..ec07441 100644 --- a/clang/lib/Frontend/ASTMerge.cpp +++ b/clang/lib/Frontend/ASTMerge.cpp @@ -51,10 +51,8 @@ void ASTMergeAction::ExecuteAction() { ASTImporter Importer(CI.getASTContext(), CI.getFileManager(), - CI.getFileSystemOpts(), Unit->getASTContext(), - Unit->getFileManager(), - Unit->getFileSystemOpts()); + Unit->getFileManager()); TranslationUnitDecl *TU = Unit->getASTContext().getTranslationUnitDecl(); for (DeclContext::decl_iterator D = TU->decls_begin(), |