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

Fixed the preprocessor.cpp(1166) warning in #2123.

This commit is contained in:
Edoardo Prezioso 2012-06-26 12:28:52 +02:00
parent 0042ee7bc8
commit 1ad56a25c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/preprocessor.cpp
View File

@ -2655,7 +2655,7 @@ std::string Preprocessor::expandMacros(const std::string &code, std::string file
// * when pos goes beyond a limit the limit needs to be // * when pos goes beyond a limit the limit needs to be
// deleted because it is unsafe to insert/delete text // deleted because it is unsafe to insert/delete text
// after the limit otherwise // after the limit otherwise
std::map<const PreprocessorMacro *, unsigned int> limits; std::map<const PreprocessorMacro *, size_t> limits;
// pos is the current position in line // pos is the current position in line
std::string::size_type pos = 0; std::string::size_type pos = 0;
@ -2717,7 +2717,7 @@ std::string Preprocessor::expandMacros(const std::string &code, std::string file
// check that pos is within allowed limits for this // check that pos is within allowed limits for this
// macro // macro
{ {
const std::map<const PreprocessorMacro *, unsigned int>::const_iterator it2 = limits.find(macro); const std::map<const PreprocessorMacro *, size_t>::const_iterator it2 = limits.find(macro);
if (it2 != limits.end() && pos <= line.length() - it2->second) if (it2 != limits.end() && pos <= line.length() - it2->second)
break; break;
} }
@ -2777,7 +2777,7 @@ std::string Preprocessor::expandMacros(const std::string &code, std::string file
++pos2; ++pos2;
// Remove old limits // Remove old limits
for (std::map<const PreprocessorMacro *, unsigned int>::iterator iter = limits.begin(); for (std::map<const PreprocessorMacro *, size_t>::iterator iter = limits.begin();
iter != limits.end();) { iter != limits.end();) {
if ((line.length() - pos1) < iter->second) { if ((line.length() - pos1) < iter->second) {
// We have gone past this limit, so just delete it // We have gone past this limit, so just delete it