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

Visual Studio: Fixed compiler warnings about assignment in condition

This commit is contained in:
Daniel Marjamäki 2010-11-08 17:29:08 +01:00
parent 23b50a3d81
commit 27b7638901
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkother.cpp
View File

@ -231,12 +231,12 @@ void CheckOther::checkIncorrectLogicOperator()
{ {
// Find a pair of OR'd terms, with or without parenthesis // Find a pair of OR'd terms, with or without parenthesis
const Token *logicTok = NULL, *term1Tok = NULL, *term2Tok = NULL; const Token *logicTok = NULL, *term1Tok = NULL, *term2Tok = NULL;
if ((logicTok = Token::findmatch(tok, "( %any% != %any% ) %oror% ( %any% != %any% ) !!&&", endTok))) if (NULL != (logicTok = Token::findmatch(tok, "( %any% != %any% ) %oror% ( %any% != %any% ) !!&&", endTok)))
{ {
term1Tok = logicTok->next(); term1Tok = logicTok->next();
term2Tok = logicTok->tokAt(7); term2Tok = logicTok->tokAt(7);
} }
else if ((logicTok = Token::findmatch(tok, "%any% != %any% %oror% %any% != %any% !!&&", endTok))) else if (NULL != (logicTok = Token::findmatch(tok, "%any% != %any% %oror% %any% != %any% !!&&", endTok)))
{ {
term1Tok = logicTok; term1Tok = logicTok;
term2Tok = logicTok->tokAt(4); term2Tok = logicTok->tokAt(4);