From 2b484dc0d93e7577ceb153fb8c6114aaaa03d79a Mon Sep 17 00:00:00 2001
From: Adrian Kummerländer
Date: Wed, 11 Jun 2014 18:33:15 +0200
Subject: Fixed include entity resolution logic * if a square bracket enclosed
 path can be extracted but not resolved against the include path vector we
 should return at least the extracted path and not the raw path * otherwise
 the system has no chance of correctly resolving things ** additionally error
 messages were showing the square bracket syntax instead of the actual path

---
 src/support/include_entity_resolver.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/support/include_entity_resolver.cc b/src/support/include_entity_resolver.cc
index 5e106f2..86535c8 100644
--- a/src/support/include_entity_resolver.cc
+++ b/src/support/include_entity_resolver.cc
@@ -63,7 +63,7 @@ boost::filesystem::path IncludeEntityResolver::resolve(
 		if ( auto resolvedPath = this->resolve(*filePath) ) {
 			return *resolvedPath;
 		} else {
-			return getPathFromSystemId(rawPath);
+			return *filePath;
 		}
 	} else {
 		return getPathFromSystemId(rawPath);
-- 
cgit v1.2.3