diff options
Diffstat (limited to 'clang/lib/Lex/HeaderSearch.cpp')
| -rw-r--r-- | clang/lib/Lex/HeaderSearch.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Lex/HeaderSearch.cpp b/clang/lib/Lex/HeaderSearch.cpp index 7df1ca1..3366f15 100644 --- a/clang/lib/Lex/HeaderSearch.cpp +++ b/clang/lib/Lex/HeaderSearch.cpp @@ -863,7 +863,7 @@ diagnoseFrameworkInclude(DiagnosticsEngine &Diags, SourceLocation IncludeLoc, OptionalFileEntryRef HeaderSearch::LookupFile( StringRef Filename, SourceLocation IncludeLoc, bool isAngled, ConstSearchDirIterator FromDir, ConstSearchDirIterator *CurDirArg, - ArrayRef<std::pair<const FileEntry *, const DirectoryEntry *>> Includers, + ArrayRef<std::pair<const FileEntry *, DirectoryEntryRef>> Includers, SmallVectorImpl<char> *SearchPath, SmallVectorImpl<char> *RelativePath, Module *RequestingModule, ModuleMap::KnownHeader *SuggestedModule, bool *IsMapped, bool *IsFrameworkFound, bool SkipCache, @@ -918,7 +918,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( // Concatenate the requested file onto the directory. // FIXME: Portability. Filename concatenation should be in sys::Path. - TmpDir = IncluderAndDir.second->getName(); + TmpDir = IncluderAndDir.second.getName(); TmpDir.push_back('/'); TmpDir.append(Filename.begin(), Filename.end()); @@ -957,7 +957,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( ToHFI.Framework = Framework; if (SearchPath) { - StringRef SearchPathRef(IncluderAndDir.second->getName()); + StringRef SearchPathRef(IncluderAndDir.second.getName()); SearchPath->clear(); SearchPath->append(SearchPathRef.begin(), SearchPathRef.end()); } @@ -967,7 +967,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( } if (First) { diagnoseFrameworkInclude(Diags, IncludeLoc, - IncluderAndDir.second->getName(), Filename, + IncluderAndDir.second.getName(), Filename, &FE->getFileEntry()); return FE; } @@ -1122,7 +1122,7 @@ OptionalFileEntryRef HeaderSearch::LookupFile( bool FoundByHeaderMap = !IsMapped ? false : *IsMapped; if (!Includers.empty()) diagnoseFrameworkInclude( - Diags, IncludeLoc, Includers.front().second->getName(), Filename, + Diags, IncludeLoc, Includers.front().second.getName(), Filename, &File->getFileEntry(), isAngled, FoundByHeaderMap); // Remember this location for the next lookup we do. |