diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-01-06 14:30:50 +0100 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-01-06 15:02:15 +0100 |
commit | 7a068d655e5d450dc55c1e159d701bc3486617f7 (patch) | |
tree | 094d53e22e07b278fe5458f277a03df437e5df16 /src/shared/cplusplus | |
parent | 283a3d32cda68b0dcf7642d9ddbfb60dd88d9ccb (diff) | |
download | qt-creator-7a068d655e5d450dc55c1e159d701bc3486617f7.tar.gz |
C++ parser: Fix bug with conditional expressions.
Reviewed-by: Erik Verbruggen
Diffstat (limited to 'src/shared/cplusplus')
-rw-r--r-- | src/shared/cplusplus/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp index d7b3dad29f..79cbb30b58 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/shared/cplusplus/Parser.cpp @@ -4877,7 +4877,7 @@ void Parser::parseExpressionWithOperatorPrecedence(ExpressionAST *&lhs, int minP if (operPrecedence == Prec::Conditional) { condExpr = new (_pool) ConditionalExpressionAST; condExpr->question_token = oper; - if (oper == T_COLON) { + if (tok().kind() == T_COLON) { // GNU extension: // logical-or-expression '?' ':' conditional-expression condExpr->left_expression = 0; |