diff options
| author | Alp Toker <alp@nuanti.com> | 2014-01-07 02:35:33 +0000 |
|---|---|---|
| committer | Alp Toker <alp@nuanti.com> | 2014-01-07 02:35:33 +0000 |
| commit | f990cefc7ee2b4946caf659c1b4cb474a97e8681 (patch) | |
| tree | b4a71d7495c8ac58f44a0a5b4bbf7d047b50840e /clang/lib/Basic | |
| parent | 4cb063cbf058bc6af596efdc78bc36160dc19654 (diff) | |
| download | bcm5719-llvm-f990cefc7ee2b4946caf659c1b4cb474a97e8681.tar.gz bcm5719-llvm-f990cefc7ee2b4946caf659c1b4cb474a97e8681.zip | |
Bring back magic constants in the digraph diagnostic
This backs out changes in commit r198605 and part of r198604, replacing the
original tok::kw_template with a slightly more obvious placeholder
tok::unknown.
llvm-svn: 198666
Diffstat (limited to 'clang/lib/Basic')
| -rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index a5242c94521..f515965fa73 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -646,8 +646,6 @@ static const char *getTokenDescForDiagnostic(tok::TokenKind Kind) { switch (Kind) { case tok::identifier: return "identifier"; - case tok::annot_template_id: - return "template name"; default: return 0; } |

