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 | 4f2e28182e76b413693d710759bceba991128b7b (patch) | |
| tree | 2afdb23e1ff38fe177e4ad8fcc1f72823634121f /include/clang/Basic/DiagnosticParseKinds.td | |
| parent | c44757105021d1429f9430d5ff0da45b02b9f741 (diff) | |
| download | clang-4f2e28182e76b413693d710759bceba991128b7b.tar.gz clang-4f2e28182e76b413693d710759bceba991128b7b.tar.bz2 clang-4f2e28182e76b413693d710759bceba991128b7b.tar.xz | |
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.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@198666 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/DiagnosticParseKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 4ebc29e002..fc6fca55e0 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -640,7 +640,9 @@ def err_ctor_init_missing_comma : Error< def err_friend_decl_defines_type : Error< "cannot define a type in a friend declaration">; def err_missing_whitespace_digraph : Error< - "found '<::' after a %0 which forms the digraph '<:' (aka '[') and a ':', did you mean '< ::'?">; + "found '<::' after a " + "%select{template name|const_cast|dynamic_cast|reinterpret_cast|static_cast}0" + " which forms the digraph '<:' (aka '[') and a ':', did you mean '< ::'?">; def ext_deleted_function : ExtWarn< "deleted function definitions are a C++11 extension">, InGroup<CXX11>; |