diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-06-27 08:17:02 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-06-27 08:17:02 +0000 |
| commit | d95e1cda9eddd5ce3a538d410d45b816c73ad3d2 (patch) | |
| tree | b3899d1fc34f112ef466370149412c0fe80579b8 /clang/lib/Parse/Parser.cpp | |
| parent | 33400e3670cfa87d3689ade561f9541bf9ea42d1 (diff) | |
| download | bcm5719-llvm-d95e1cda9eddd5ce3a538d410d45b816c73ad3d2.tar.gz bcm5719-llvm-d95e1cda9eddd5ce3a538d410d45b816c73ad3d2.zip | |
Fix screwup with my previous patch which broke tests. (The patch is
making sure we return true when annotating a function template with
explicit template arguments, but not when we don't annotate anything.)
llvm-svn: 74383
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
| -rw-r--r-- | clang/lib/Parse/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 6cb07ef9196..29d1d8792e1 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -963,7 +963,7 @@ bool Parser::TryAnnotateTypeOrScopeToken() { } if (SS.isEmpty()) - return Tok.isNot(tok::identifier); + return Tok.isNot(tok::identifier) && Tok.isNot(tok::coloncolon); // A C++ scope specifier that isn't followed by a typename. // Push the current token back into the token stream (or revert it if it is |
