#6913 max-configs=1 buggs out includefile resolving in case of circular dependency. Use simplified paths for internal list of includes parsed already

This commit is contained in:
Alexander Mai 2016-02-14 11:51:18 +01:00
parent a892e6eddc
commit 17bb07d522
1 changed files with 2 additions and 1 deletions

View File

@ -2285,7 +2285,8 @@ std::string Preprocessor::handleIncludes(const std::string &code, const std::str
continue;
}
includes.push_back(filename);
// #6913 - simplify Path to avoid strange recursion
includes.push_back(Path::simplifyPath(filename));
// Don't include header if it's already included and contains #pragma once
if (pragmaOnce.find(filename) != pragmaOnce.end()) {