summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2013-01-25 01:50:28 +0000
committerDaniel Dunbar <daniel@zuster.org>2013-01-25 01:50:28 +0000
commitae4feb62e075190c8754c778a24f62f2e36e583f (patch)
tree4e6cf909b56f0c8821859ce1ea9f370892008e18 /clang/lib
parentf0add23a0e8ac0ee796cc69a28dcad52c563d97f (diff)
downloadbcm5719-llvm-ae4feb62e075190c8754c778a24f62f2e36e583f.tar.gz
bcm5719-llvm-ae4feb62e075190c8754c778a24f62f2e36e583f.zip
[Lex] Remove DirectoryLookup.UserSpecified, which is unused.
llvm-svn: 173409
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Frontend/InitHeaderSearch.cpp9
-rw-r--r--clang/lib/Lex/PPDirectives.cpp2
2 files changed, 6 insertions, 5 deletions
diff --git a/clang/lib/Frontend/InitHeaderSearch.cpp b/clang/lib/Frontend/InitHeaderSearch.cpp
index 444d9f3c385..00a14914121 100644
--- a/clang/lib/Frontend/InitHeaderSearch.cpp
+++ b/clang/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/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
index 156ebd21f9d..74376e47acb 100644
--- a/clang/lib/Lex/PPDirectives.cpp
+++ b/clang/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.
OpenPOWER on IntegriCloud