walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed #2732 (Make it easier for users to tell 'How to supply header files')

This commit is contained in:
Daniel Marjamäki 2014-03-11 16:05:19 +01:00
parent 385478d89e
commit 94454df14f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/preprocessor.cpp
View File

@ -2378,7 +2378,7 @@ void Preprocessor::missingInclude(const std::string &filename, unsigned int line
locationList.push_back(loc); locationList.push_back(loc);
} }
ErrorLogger::ErrorMessage errmsg(locationList, Severity::information, ErrorLogger::ErrorMessage errmsg(locationList, Severity::information,
(headerType==SystemHeader) ? "Include file: <" + header + "> not found." : "Include file: \"" + header + "\" not found.", (headerType==SystemHeader) ? "Include file: <" + header + "> not found." : "Include file: \"" + header + "\" not found. Use -I to configure include paths.",
msgtype, false); msgtype, false);
errmsg.file0 = file0; errmsg.file0 = file0;
_errorLogger->reportInfo(errmsg); _errorLogger->reportInfo(errmsg);

4
test/testpreprocessor.cpp
View File

@ -3535,7 +3535,7 @@ private:
errout.str(""); errout.str("");
settings.checkConfiguration = true; settings.checkConfiguration = true;
preprocessor.handleIncludes(code,"test.c",includePaths,defs,pragmaOnce,std::list<std::string>()); preprocessor.handleIncludes(code,"test.c",includePaths,defs,pragmaOnce,std::list<std::string>());
ASSERT_EQUALS("[test.c:1]: (information) Include file: \"missing-include!!.h\" not found.\n", errout.str()); ASSERT_EQUALS("[test.c:1]: (information) Include file: \"missing-include!!.h\" not found. Use -I to configure include paths.\n", errout.str());
pragmaOnce.clear(); pragmaOnce.clear();
errout.str(""); errout.str("");
@ -3882,7 +3882,7 @@ private:
preprocessor.preprocess(istr, actual, "file.c"); preprocessor.preprocess(istr, actual, "file.c");
// Compare results.. // Compare results..
ASSERT_EQUALS("[file.c:2]: (information) Include file: \"config.h\" not found.\n", errout.str()); ASSERT_EQUALS("[file.c:2]: (information) Include file: \"config.h\" not found. Use -I to configure include paths.\n", errout.str());
ASSERT_EQUALS("\n\n\n\n\n", actual[""]); ASSERT_EQUALS("\n\n\n\n\n", actual[""]);
} }