r173854 - [Frontend] Rename a member variable to clarify its intent.
Daniel Dunbar
daniel at zuster.org
Tue Jan 29 15:59:43 PST 2013
Author: ddunbar
Date: Tue Jan 29 17:59:43 2013
New Revision: 173854
URL: http://llvm.org/viewvc/llvm-project?rev=173854&view=rev
Log:
[Frontend] Rename a member variable to clarify its intent.
Modified:
cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=173854&r1=173853&r2=173854&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Tue Jan 29 17:59:43 2013
@@ -43,13 +43,13 @@ class InitHeaderSearch {
HeaderSearch &Headers;
bool Verbose;
std::string IncludeSysroot;
- bool IsNotEmptyOrRoot;
+ bool HasSysroot;
public:
InitHeaderSearch(HeaderSearch &HS, bool verbose, StringRef sysroot)
: Headers(HS), Verbose(verbose), IncludeSysroot(sysroot),
- IsNotEmptyOrRoot(!(sysroot.empty() || sysroot == "/")) {
+ HasSysroot(!(sysroot.empty() || sysroot == "/")) {
}
/// AddPath - Add the specified path to the specified group list.
@@ -121,9 +121,10 @@ void InitHeaderSearch::AddPath(const Twi
SmallString<256> MappedPathStorage;
StringRef MappedPathStr = Path.toStringRef(MappedPathStorage);
- // Handle isysroot.
- if ((Group == System || Group == CXXSystem) && !IgnoreSysRoot &&
- CanPrefixSysroot(MappedPathStr) && IsNotEmptyOrRoot) {
+ // Prepend the sysroot, if desired and this is a system header group.
+ if (HasSysroot && !IgnoreSysRoot &&
+ (Group == System || Group == CXXSystem) &&
+ CanPrefixSysroot(MappedPathStr)) {
MappedPathStorage.clear();
MappedPathStr = (IncludeSysroot + Path).toStringRef(MappedPathStorage);
}
More information about the cfe-commits
mailing list