diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Frontend/InitHeaderSearch.cpp | 9 | ||||
| -rw-r--r-- | lib/Lex/PPDirectives.cpp | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/Frontend/InitHeaderSearch.cpp b/lib/Frontend/InitHeaderSearch.cpp index 444d9f3c38..00a1491412 100644 --- a/lib/Frontend/InitHeaderSearch.cpp +++ b/lib/Frontend/InitHeaderSearch.cpp @@ -141,8 +141,8 @@ void InitHeaderSearch::AddPath(const Twine &Path, // If the directory exists, add it. if (const DirectoryEntry *DE = FM.getDirectory(MappedPathStr)) { - IncludePath.push_back(std::make_pair(Group, DirectoryLookup(DE, Type, - isUserSupplied, isFramework))); + IncludePath.push_back( + std::make_pair(Group, DirectoryLookup(DE, Type, isFramework))); return; } @@ -152,8 +152,9 @@ void InitHeaderSearch::AddPath(const Twine &Path, if (const FileEntry *FE = FM.getFile(MappedPathStr)) { if (const HeaderMap *HM = Headers.CreateHeaderMap(FE)) { // It is a headermap, add it to the search path. - IncludePath.push_back(std::make_pair(Group, DirectoryLookup(HM, Type, - isUserSupplied, Group == IndexHeaderMap))); + IncludePath.push_back( + std::make_pair(Group, + DirectoryLookup(HM, Type, Group == IndexHeaderMap))); return; } } diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 156ebd21f9..74376e47ac 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -1376,7 +1376,7 @@ void Preprocessor::HandleIncludeDirective(SourceLocation HashLoc, if (Callbacks->FileNotFound(Filename, RecoveryPath)) { if (const DirectoryEntry *DE = FileMgr.getDirectory(RecoveryPath)) { // Add the recovery path to the list of search paths. - DirectoryLookup DL(DE, SrcMgr::C_User, true, false); + DirectoryLookup DL(DE, SrcMgr::C_User, false); HeaderInfo.AddSearchPath(DL, isAngled); // Try the lookup again, skipping the cache. |