From 989e0e7ccb7b77e5d5327d155128404649113e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Fri, 7 Jan 2011 19:48:51 +0100
Subject: [PATCH] Preprocessor: fix bug when determining location when there is
 a missing include. ticket: #2326

---
 lib/preprocessor.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index f95c4286c..43d026b16 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -1605,8 +1605,10 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
             if (_errorLogger && _settings && _settings->isEnabled("missingInclude"))
 #endif
             {
+                std::string f = filePath;
+            
                 // Determine line number of include
-                unsigned int linenr = 1;
+                unsigned int linenr = 0;
                 unsigned int level = 0;
                 for (std::string::size_type p = 1; p <= pos; ++p)
                 {
@@ -1620,13 +1622,16 @@ void Preprocessor::handleIncludes(std::string &code, const std::string &filePath
                     {
                         if (level == 0)
                         {
+                            const std::string::size_type pos1 = pos - p + 7;
+                            const std::string::size_type pos2 = code.find_first_of("\"\n", pos1);
+                            f = code.substr(pos1, (pos2 == std::string::npos) ? pos2 : (pos2 - pos1));
                             break;
                         }
                         --level;
                     }
                 }
 
-                missingInclude(Path::toNativeSeparators(filePath),
+                missingInclude(Path::toNativeSeparators(f),
                                linenr,
                                filename,
                                headerType == UserHeader);