make it a bit more clear in what way the ivar is consistent.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44945 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Sema/SemaDeclObjC.cpp b/Sema/SemaDeclObjC.cpp
index 1a56e4822a8f956548309ac80f2895e3104b5947..b2cad375f8a8dbf53ed888874aeebd8b66116944 100644 (file)
--- a/Sema/SemaDeclObjC.cpp
+++ b/Sema/SemaDeclObjC.cpp
@@ -440,9 +440,9 @@ void Sema::CheckImplementationIvars(ObjcImplementationDecl *ImpDecl,
   }
   
   if (numIvars > 0)
-    Diag(ivars[j]->getLocation(), diag::err_inconsistant_ivar);
+    Diag(ivars[j]->getLocation(), diag::err_inconsistant_ivar_count);
   else if (IVI != IVE)
-    Diag((*IVI)->getLocation(), diag::err_inconsistant_ivar);
+    Diag((*IVI)->getLocation(), diag::err_inconsistant_ivar_count);
 }
 
 /// CheckProtocolMethodDefs - This routine checks unimpletented methods

diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 7fec38e800d1a0f20f212fe525a4545f6b689690..684141a367145a824ffe722cba43d83b60f7d760 100644 (file)
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -436,8 +436,8 @@ DIAG(err_conflicting_super_class, ERROR,
      "conflicting super class name '%0'")
 DIAG(err_conflicting_ivar_name, ERROR,
      "conflicting instance variable name '%0'")
-DIAG(err_inconsistant_ivar, ERROR,
-     "inconsistent instance variable specification")
+DIAG(err_inconsistant_ivar_count, ERROR,
+     "inconsistent number of instance variables specified")
 DIAG(err_conflicting_ivar_type, ERROR,
      "conflicting instance variable type")
 DIAG(warn_undef_method_impl, WARNING,