objc: change option to be -Wobjc-interface-ivars

llvm-svn: 157394

diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td
index 50aa9b3..845de19 100644 (file)
--- a/clang/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td
@@ -3040,7 +3040,7 @@ def err_misplaced_ivar : Error<
   "ivars may not be placed in %select{categories|class extension}0">;
 def warn_ivars_in_interface : Warning<
   "declaration of ivars in the interface is deprecated">,
-  InGroup<DiagGroup<"interface-ivars">>, DefaultIgnore;
+  InGroup<DiagGroup<"objc-interface-ivars">>, DefaultIgnore;
 def ext_enum_value_not_int : Extension<
   "ISO C restricts enumerator values to range of 'int' (%0 is too "
   "%select{small|large}1)">;

diff --git a/clang/test/SemaObjC/no-ivar-in-interface-block.m b/clang/test/SemaObjC/no-ivar-in-interface-block.m
index 897f7d8..1d3b518 100644 (file)
--- a/clang/test/SemaObjC/no-ivar-in-interface-block.m
+++ b/clang/test/SemaObjC/no-ivar-in-interface-block.m
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1  -fsyntax-only -verify -Winterface-ivars %s
+// RUN: %clang_cc1  -fsyntax-only -verify -Wobjc-interface-ivars %s
 // rdar://10763173
 
 @interface I