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 | 3c9028a5e8dfb120c0d917849a1f79c091a98b88 (patch) | |
| tree | ccb86c5b05989a5055e8c354eaaf30dc8307eeb0 /lib/Parse/Parser.cpp | |
| parent | 8060ed55d6ec003af072d10d92df772c7b9b8475 (diff) | |
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.)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74383 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/Parser.cpp')
| -rw-r--r-- | lib/Parse/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Parse/Parser.cpp b/lib/Parse/Parser.cpp index 6cb07ef919..29d1d8792e 100644 --- a/lib/Parse/Parser.cpp +++ b/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 |