From 2a3420eedfeaf4cca908e4da53876967dd72cc77 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 5 Jun 2018 13:38:54 +0200 Subject: [PATCH] logic: fixed enless loop in include path auto detection (issue #585) --- src/lib_cxx/utility/IncludeProcessing.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib_cxx/utility/IncludeProcessing.cpp b/src/lib_cxx/utility/IncludeProcessing.cpp index fb633708..6b9672c8 100644 --- a/src/lib_cxx/utility/IncludeProcessing.cpp +++ b/src/lib_cxx/utility/IncludeProcessing.cpp @@ -121,6 +121,7 @@ std::set IncludeProcessing::getHeaderSearchDirectories( } if (foundIncludedPath.exists()) { + foundIncludedPath.makeCanonical(); if (processedFilePaths.find(foundIncludedPath.wstr()) == processedFilePaths.end()) { unprocessedFilePathsForNextIteration.insert(foundIncludedPath); @@ -231,7 +232,7 @@ std::vector IncludeProcessing::doGetUnresolvedIncludeDirective } FilePath IncludeProcessing::resolveIncludeDirective( - const IncludeDirective& includeDirective, + const IncludeDirective& includeDirective, const std::set& headerSearchDirectories ) {