diff options
| author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-02-05 13:28:42 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2010-02-05 16:25:22 +0100 |
| commit | 76036ca7a71d389717b65162af3501b0ba83188c (patch) | |
| tree | edc4da2a2b4620df08d0a2c8115b3191dd0dac62 /src/shared/cplusplus | |
| parent | fa5f9246c2d7922e8e294b64d4417c6a983d4c56 (diff) | |
| download | qt-creator-76036ca7a71d389717b65162af3501b0ba83188c.tar.gz | |
Avoid compile warning by putting parenthesis around && within ||
Diffstat (limited to 'src/shared/cplusplus')
| -rw-r--r-- | src/shared/cplusplus/Parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index cf32c5a336..de66dbfac8 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -4412,8 +4412,8 @@ void Parser::parseExpressionWithOperatorPrecedence(ExpressionAST *&lhs, int minP } for (int tokenKindAhead = tok().kind(), precedenceAhead = precedence(tokenKindAhead, _templateArguments); - precedenceAhead > operPrecedence && isBinaryOperator(tokenKindAhead) - || precedenceAhead == operPrecedence && isRightAssociative(tokenKindAhead); + (precedenceAhead > operPrecedence && isBinaryOperator(tokenKindAhead)) + || (precedenceAhead == operPrecedence && isRightAssociative(tokenKindAhead)); tokenKindAhead = tok().kind(), precedenceAhead = precedence(tokenKindAhead, _templateArguments)) { parseExpressionWithOperatorPrecedence(rhs, precedenceAhead); } |