From 7a068d655e5d450dc55c1e159d701bc3486617f7 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Thu, 6 Jan 2011 14:30:50 +0100
Subject: C++ parser: Fix bug with conditional expressions.

Reviewed-by: Erik Verbruggen
---
 src/shared/cplusplus/Parser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/shared/cplusplus')

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;
-- 
cgit v1.2.1