diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Lex/PTHManager.h | 3 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Lex/PTHLexer.cpp | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/clang/include/clang/Lex/PTHManager.h b/clang/include/clang/Lex/PTHManager.h index 531ec11ea1a..5e8a4f144c9 100644 --- a/clang/include/clang/Lex/PTHManager.h +++ b/clang/include/clang/Lex/PTHManager.h @@ -119,8 +119,7 @@ public: /// Create - This method creates PTHManager objects. The 'file' argument /// is the name of the PTH file. This method returns NULL upon failure. - static PTHManager *Create(const std::string& file, FileManager &FileMgr, - Diagnostic &Diags); + static PTHManager *Create(const std::string& file, Diagnostic &Diags); void setPreprocessor(Preprocessor *pp) { PP = pp; } diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 125f271a62f..7f3eb21bb8c 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -180,7 +180,7 @@ CompilerInstance::createPreprocessor(Diagnostic &Diags, // Create a PTH manager if we are using some form of a token cache. PTHManager *PTHMgr = 0; if (!PPOpts.TokenCache.empty()) - PTHMgr = PTHManager::Create(PPOpts.TokenCache, FileMgr, Diags); + PTHMgr = PTHManager::Create(PPOpts.TokenCache, Diags); // Create the Preprocessor. HeaderSearch *HeaderInfo = new HeaderSearch(FileMgr); diff --git a/clang/lib/Lex/PTHLexer.cpp b/clang/lib/Lex/PTHLexer.cpp index 23ff3f47907..08de3a80f95 100644 --- a/clang/lib/Lex/PTHLexer.cpp +++ b/clang/lib/Lex/PTHLexer.cpp @@ -434,10 +434,9 @@ static void InvalidPTH(Diagnostic &Diags, const char *Msg) { Diags.Report(Diags.getCustomDiagID(Diagnostic::Error, Msg)); } -PTHManager *PTHManager::Create(const std::string &file, FileManager &FileMgr, - Diagnostic &Diags) { +PTHManager *PTHManager::Create(const std::string &file, Diagnostic &Diags) { // Memory map the PTH file. - llvm::OwningPtr<llvm::MemoryBuffer> File(FileMgr.getBufferForFile(file)); + llvm::OwningPtr<llvm::MemoryBuffer> File(llvm::MemoryBuffer::getFile(file)); if (!File) { Diags.Report(diag::err_invalid_pth_file) << file; |
