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

amai2012 · amai2012 · commit 17bb07d52267 · 2016-02-14T11:51:18.000+01:00
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -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()) {

Original file line number	Diff line number	Diff line change
`@@ -2285,7 +2285,8 @@ std::string Preprocessor::handleIncludes(const std::string &code, const std::str`
`2285`	`2285`	`continue;`
`2286`	`2286`	`}`
`2287`	`2287`
`2288`		`- includes.push_back(filename);`
	`2288`	`+ // #6913 - simplify Path to avoid strange recursion`
	`2289`	`+ includes.push_back(Path::simplifyPath(filename));`
`2289`	`2290`
`2290`	`2291`	`// Don't include header if it's already included and contains #pragma once`
`2291`	`2292`	`if (pragmaOnce.find(filename) != pragmaOnce.end()) {`