summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Collingbourne <peter@pcc.me.uk>2013-09-04 00:10:25 +0000
committerPeter Collingbourne <peter@pcc.me.uk>2013-09-04 00:10:25 +0000
commitd0df6406fb0c7efc62b5c065f98fe06c44893ac0 (patch)
tree0eb82252ac6ce2084282c31eca6fc84e5dd944ba
parent89f6d100a44018ca451367c4e8c0d874be5cc77a (diff)
downloadbcm5719-llvm-d0df6406fb0c7efc62b5c065f98fe06c44893ac0.tar.gz
bcm5719-llvm-d0df6406fb0c7efc62b5c065f98fe06c44893ac0.zip
Add a diagnostic group for the "ignoring (static|inline) keyword on
explicit template instantiation" warning. llvm-svn: 189893
-rw-r--r--clang/include/clang/Basic/DiagnosticParseKinds.td2
-rw-r--r--clang/test/Misc/warning-flags.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td
index 5c4a21972b4..8f5ce698ce6 100644
--- a/clang/include/clang/Basic/DiagnosticParseKinds.td
+++ b/clang/include/clang/Basic/DiagnosticParseKinds.td
@@ -616,7 +616,7 @@ def warn_cxx98_compat_extern_template : Warning<
InGroup<CXX98CompatPedantic>, DefaultIgnore;
def warn_static_inline_explicit_inst_ignored : Warning<
"ignoring '%select{static|inline}0' keyword on explicit template "
- "instantiation">;
+ "instantiation">, InGroup<DiagGroup<"static-inline-explicit-instantiation">>;
// Constructor template diagnostics.
def err_out_of_line_constructor_template_id : Error<
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index 1ddd9e1dac6..0062573ac10 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -18,7 +18,7 @@ This test serves two purposes:
The list of warnings below should NEVER grow. It should gradually shrink to 0.
-CHECK: Warnings without flags (136):
+CHECK: Warnings without flags (135):
CHECK-NEXT: ext_delete_void_ptr_operand
CHECK-NEXT: ext_expected_semi_decl_list
CHECK-NEXT: ext_explicit_specialization_storage_class
@@ -141,7 +141,6 @@ CHECK-NEXT: warn_redeclaration_without_attribute_prev_attribute_ignored
CHECK-NEXT: warn_register_objc_catch_parm
CHECK-NEXT: warn_related_result_type_compatibility_class
CHECK-NEXT: warn_related_result_type_compatibility_protocol
-CHECK-NEXT: warn_static_inline_explicit_inst_ignored
CHECK-NEXT: warn_static_non_static
CHECK-NEXT: warn_template_export_unsupported
CHECK-NEXT: warn_template_spec_extra_headers
OpenPOWER on IntegriCloud