aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/3rdparty/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorChristian Kamm <kamm@incasoftware.de>2014-06-04 16:18:16 +0200
committerChristian Kamm <kamm@incasoftware.de>2014-06-16 20:06:58 +0200
commite85c6f4b385da2b3da447a4b389dadd3f8d8990f (patch)
treef5ea7048c6c5bff36d316133f22bfef057b03eff /src/libs/3rdparty/cplusplus/Parser.cpp
parent64f3a4dc3d00b9d0c9ac7a7e036c0cb5175524b1 (diff)
C++11: Fix parsing of expressions like vector<int>{1}.
The parser considers '{' an operator and thus thought "template-id {" couldn't possibly be valid. This patch adds '{' as an exception to the rule. Change-Id: I40730fcdc5cade48566b4c8b6fde390f455bbdba Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.cpp')
-rw-r--r--src/libs/3rdparty/cplusplus/Parser.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
index 876b138b6a..dfd6d1e49a 100644
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@ -4731,6 +4731,7 @@ bool Parser::parseNameId(NameAST *&name)
case T_SEMICOLON:
case T_LBRACKET:
case T_LPAREN:
+ case T_LBRACE:
return true;
case T_THIS: