summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseTemplate.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2011-01-11 00:45:18 +0000
committerDouglas Gregor <dgregor@apple.com>2011-01-11 00:45:18 +0000
commit180dda9b6e28be6ff60c1f84d4b6d3c9884731a0 (patch)
tree0db67b26de6e9ab95cf3606fbadcb4793601d10b /clang/lib/Parse/ParseTemplate.cpp
parentd490c2d2aee591f593ec3cabb1caed801cfe2ad8 (diff)
downloadbcm5719-llvm-180dda9b6e28be6ff60c1f84d4b6d3c9884731a0.tar.gz
bcm5719-llvm-180dda9b6e28be6ff60c1f84d4b6d3c9884731a0.zip
Make sure that we parse a '>>' that closes two template argument lists
appropritely when there are no other template arguments. llvm-svn: 123204
Diffstat (limited to 'clang/lib/Parse/ParseTemplate.cpp')
-rw-r--r--clang/lib/Parse/ParseTemplate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index aeafba8990e..93f5c9ba43d 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -677,7 +677,7 @@ Parser::ParseTemplateIdAfterTemplateName(TemplateTy Template,
bool Invalid = false;
{
GreaterThanIsOperatorScope G(GreaterThanIsOperator, false);
- if (Tok.isNot(tok::greater))
+ if (Tok.isNot(tok::greater) && Tok.isNot(tok::greatergreater))
Invalid = ParseTemplateArgumentList(TemplateArgs);
if (Invalid) {
OpenPOWER on IntegriCloud