Merge pull request #727 from Dmitry-Me/fixC4706

orbitcowboy · orbitcowboy · commit 66897a95f472 · 2015-12-15T10:58:14.000+01:00
Fix C4706 assignment within conditional
diff --git a/lib/tokenlist.cpp b/lib/tokenlist.cpp
@@ -1073,7 +1073,7 @@ void TokenList::validateAst()
 
         // check for endless recursion
         const Token* parent=tok;
-        while ((parent = parent->astParent())) {
+        while ((parent = parent->astParent()) != nullptr) {
             if (parent==tok)
                 throw InternalError(tok, "AST broken: endless recursion from '" + tok->str() + "'", InternalError::SYNTAX);
         }

Original file line number	Diff line number	Diff line change
`@@ -1073,7 +1073,7 @@ void TokenList::validateAst()`
`1073`	`1073`
`1074`	`1074`	`// check for endless recursion`
`1075`	`1075`	`const Token* parent=tok;`
`1076`		`- while ((parent = parent->astParent())) {`
	`1076`	`+ while ((parent = parent->astParent()) != nullptr) {`
`1077`	`1077`	`if (parent==tok)`
`1078`	`1078`	`throw InternalError(tok, "AST broken: endless recursion from '" + tok->str() + "'", InternalError::SYNTAX);`
`1079`	`1079`	`}`