summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-03-23 14:03:05 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2010-03-23 14:13:22 +0100
commiteebf498aaef5551b1863d61ffb5f46507093339b (patch)
tree5ba4f8e3040bfdec464a1c70bef13cfae5feb551 /src/shared/cplusplus/Parser.cpp
parentae715143606c1c432aa6f934578c10c3eee69f76 (diff)
downloadqt-creator-eebf498aaef5551b1863d61ffb5f46507093339b.tar.gz
Parse C++0x type-parameters.
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r--src/shared/cplusplus/Parser.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index e08fce0416..e9fac60fb3 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -1494,6 +1494,8 @@ bool Parser::parseTypenameTypeParameter(DeclarationAST *&node)
if (LA() == T_CLASS || LA() == T_TYPENAME) {
TypenameTypeParameterAST *ast = new (_pool) TypenameTypeParameterAST;
ast->classkey_token = consumeToken();
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ ast->dot_dot_dot_token = consumeToken();
parseName(ast->name);
if (LA() == T_EQUAL) {
ast->equal_token = consumeToken();
@@ -1518,6 +1520,8 @@ bool Parser::parseTemplateTypeParameter(DeclarationAST *&node)
ast->greater_token = consumeToken();
if (LA() == T_CLASS)
ast->class_token = consumeToken();
+ if (_cxx0xEnabled && LA() == T_DOT_DOT_DOT)
+ ast->dot_dot_dot_token = consumeToken();
// parse optional name
parseName(ast->name);