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

Fixed #6154: Don't suggest to reduce scope if inner scope is a lambda.

This commit is contained in:
PKEuS 2014-09-10 20:56:34 +02:00
parent 0a416910c4
commit 865fc9aa67
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkother.cpp
View File

@ -1457,7 +1457,7 @@ void CheckOther::checkVariableScope()
bool reduce = true; bool reduce = true;
bool used = false; // Don't warn about unused variables bool used = false; // Don't warn about unused variables
for (; tok != var->scope()->classEnd; tok = tok->next()) { for (; tok != var->scope()->classEnd; tok = tok->next()) {
if (tok->str() == "{" && tok->scope() != tok->previous()->scope() && !tok->isExpandedMacro()) { if (tok->str() == "{" && tok->scope() != tok->previous()->scope() && !tok->isExpandedMacro() && tok->scope()->type != Scope::eLambda) {
if (used) { if (used) {
bool used2 = false; bool used2 = false;
if (!checkInnerScope(tok, var, used2) || used2) { if (!checkInnerScope(tok, var, used2) || used2) {

11
test/testother.cpp
View File

@ -75,6 +75,7 @@ private:
TEST_CASE(varScope20); // Ticket #5103 TEST_CASE(varScope20); // Ticket #5103
TEST_CASE(varScope21); // Ticket #5382 TEST_CASE(varScope21); // Ticket #5382
TEST_CASE(varScope22); // Ticket #5684 TEST_CASE(varScope22); // Ticket #5684
TEST_CASE(varScope23); // Ticket #6154
TEST_CASE(oldStylePointerCast); TEST_CASE(oldStylePointerCast);
TEST_CASE(invalidPointerCast); TEST_CASE(invalidPointerCast);
@ -1063,6 +1064,16 @@ private:
ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'p' can be reduced.\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (style) The scope of the variable 'p' can be reduced.\n", errout.str());
} }
void varScope23() { // #6154: Don't suggest to reduce scope if inner scope is a lambda
varScope("int main() {\n"
" size_t myCounter = 0;\n"
" Test myTest([&](size_t aX){\n"
" std::cout << myCounter += aX << std::endl;\n"
" });\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void checkOldStylePointerCast(const char code[]) { void checkOldStylePointerCast(const char code[]) {
// Clear the error buffer.. // Clear the error buffer..
errout.str(""); errout.str("");