diff --git a/cfg/std.cfg b/cfg/std.cfg index 812fa381d..2035a8e27 100644 --- a/cfg/std.cfg +++ b/cfg/std.cfg @@ -19,16 +19,16 @@ false false false - false - - false - - - 0- - + false + + false + + + 0- + - false - + false + false 0-255 false 0-255 false 0-255 @@ -64,7 +64,7 @@ false false false - + 0,2-36 0,2-36 0,2-36 diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp index 8c2fe82d8..863d67675 100644 --- a/lib/checkuninitvar.cpp +++ b/lib/checkuninitvar.cpp @@ -1882,11 +1882,11 @@ bool CheckUninitVar::isMemberVariableUsage(const Token *tok, bool isPointer, boo else if (!isPointer && Token::Match(tok->previous(), "[(,] %var% [,)]") && isVariableUsage(tok, isPointer, alloc, _tokenizer->isCPP())) return true; - else if (_settings->experimental && - !isPointer && - Token::Match(tok->tokAt(-2), "[(,] & %var% [,)]") && - isVariableUsage(tok, isPointer, alloc, _tokenizer->isCPP())) - return true; + else if (_settings->experimental && + !isPointer && + Token::Match(tok->tokAt(-2), "[(,] & %var% [,)]") && + isVariableUsage(tok, isPointer, alloc, _tokenizer->isCPP())) + return true; return false; }