diff options
Diffstat (limited to 'tools/libclang')
| -rw-r--r-- | tools/libclang/CIndex.cpp | 3 | ||||
| -rw-r--r-- | tools/libclang/CIndexCodeCompletion.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp index 2bc362adfc..7de7d40e03 100644 --- a/tools/libclang/CIndex.cpp +++ b/tools/libclang/CIndex.cpp @@ -2584,8 +2584,7 @@ CXFile clang_getFile(CXTranslationUnit tu, const char *file_name) { ASTUnit *CXXUnit = static_cast<ASTUnit *>(tu->TUData); FileManager &FMgr = CXXUnit->getFileManager(); - const FileEntry *File = FMgr.getFile(file_name, CXXUnit->getFileSystemOpts()); - return const_cast<FileEntry *>(File); + return const_cast<FileEntry *>(FMgr.getFile(file_name)); } } // end: extern "C" diff --git a/tools/libclang/CIndexCodeCompletion.cpp b/tools/libclang/CIndexCodeCompletion.cpp index 60c9e19f41..7fb1e8022b 100644 --- a/tools/libclang/CIndexCodeCompletion.cpp +++ b/tools/libclang/CIndexCodeCompletion.cpp @@ -234,12 +234,12 @@ struct AllocatedCXCodeCompleteResults : public CXCodeCompleteResults { /// \brief Language options used to adjust source locations. LangOptions LangOpts; - - /// \brief File manager, used for diagnostics. - FileManager FileMgr; FileSystemOptions FileSystemOpts; + /// \brief File manager, used for diagnostics. + FileManager FileMgr; + /// \brief Source manager, used for diagnostics. SourceManager SourceMgr; @@ -263,7 +263,7 @@ AllocatedCXCodeCompleteResults::AllocatedCXCodeCompleteResults() Diag(new Diagnostic( llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs))), FileMgr(FileSystemOpts), - SourceMgr(*Diag, FileMgr, FileSystemOpts) { + SourceMgr(*Diag, FileMgr) { if (getenv("LIBCLANG_OBJTRACKING")) { ++CodeCompletionResultObjects; fprintf(stderr, "+++ %d completion results\n", CodeCompletionResultObjects); |