diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-12-04 00:28:23 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-12-04 00:28:23 +0000 |
| commit | b28fcac460a31d6d033e23357ed4b3aeb4e30dbc (patch) | |
| tree | 1ab075db7820fd8591e1f8dad72cd2e29b39d019 /include/clang/Basic/DiagnosticParseKinds.td | |
| parent | 20b2dbd23164eab75cca70b32efd47cab9949e53 (diff) | |
| download | clang-b28fcac460a31d6d033e23357ed4b3aeb4e30dbc.tar.gz clang-b28fcac460a31d6d033e23357ed4b3aeb4e30dbc.tar.bz2 clang-b28fcac460a31d6d033e23357ed4b3aeb4e30dbc.tar.xz | |
Fix several crash-on-invalids when using template-ids that aren't
simple-template-ids (eg, 'operator+<int>') in weird places.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196333 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic/DiagnosticParseKinds.td')
| -rw-r--r-- | include/clang/Basic/DiagnosticParseKinds.td | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td index 2feab52ef4..3415a0078c 100644 --- a/include/clang/Basic/DiagnosticParseKinds.td +++ b/include/clang/Basic/DiagnosticParseKinds.td @@ -578,8 +578,8 @@ def err_class_on_template_template_param : Error< "template template parameter requires 'class' after the parameter list">; def err_template_spec_syntax_non_template : Error< "identifier followed by '<' indicates a class template specialization but " - "%0 %select{does not refer to a template|refers to a function " - "template|<unused>|refers to a template template parameter}1">; + "%0 %select{does not refer to a template|refers to a function template|" + "<unused>|refers to a variable template|<unused>}1">; def err_id_after_template_in_nested_name_spec : Error< "expected template name after 'template' keyword in nested name specifier">; def err_two_right_angle_brackets_need_space : Error< @@ -643,7 +643,7 @@ def err_expected_semi_after_tagdecl : Error< "expected ';' after %0">; def err_typename_refers_to_non_type_template : Error< - "typename specifier refers to a non-template">; + "typename specifier refers to a non-type template">; def err_expected_type_name_after_typename : Error< "expected an identifier or template-id after '::'">; def err_explicit_spec_non_template : Error< |