summaryrefslogtreecommitdiff
path: root/src/shared/cplusplus/Parser.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-12-09 12:32:04 +0100
committerRoberto Raggi <roberto.raggi@nokia.com>2009-12-09 12:32:04 +0100
commit0a5b2eed4c9fa9c9d9045341303c1d486fe5056f (patch)
tree4fa649ba2195efac375e59c9fb7475f5ec703d4a /src/shared/cplusplus/Parser.cpp
parent2b5016caf5f247f16e7ae03584342e322d1b8faa (diff)
downloadqt-creator-0a5b2eed4c9fa9c9d9045341303c1d486fe5056f.tar.gz
Fixed parsing of template-ids.
Task-number: QTCREATORBUG-74
Diffstat (limited to 'src/shared/cplusplus/Parser.cpp')
-rw-r--r--src/shared/cplusplus/Parser.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/shared/cplusplus/Parser.cpp b/src/shared/cplusplus/Parser.cpp
index 74d17b1ef6..dc5aaac37f 100644
--- a/src/shared/cplusplus/Parser.cpp
+++ b/src/shared/cplusplus/Parser.cpp
@@ -3400,6 +3400,9 @@ bool Parser::parseNameId(NameAST *&name)
if (! parseName(name))
return false;
+ if (LA() == T_RPAREN || LA() == T_COMMA)
+ return true;
+
QualifiedNameAST *qualified_name_id = name->asQualifiedName();
TemplateIdAST *template_id = 0;