commit 180dda9b6e28be6ff60c1f84d4b6d3c9884731a0
author Douglas Gregor <dgregor@apple.com> Tue Jan 11 00:45:18 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Jan 11 00:45:18 2011 +0000
tree 0db67b26de6e9ab95cf3606fbadcb4793601d10b
parent d490c2d2aee591f593ec3cabb1caed801cfe2ad8

Make sure that we parse a '>>' that closes two template argument lists
appropritely when there are no other template arguments.

llvm-svn: 123204

clang/lib/Parse/ParseTemplate.cpp

diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index aeafba8..93f5c9b 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -677,7 +677,7 @@
   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) {