[cfe-commits] r44945 - in /cfe/trunk: Sema/SemaDeclObjC.cpp include/clang/Basic/DiagnosticKinds.def

[Chris Lattner]

Author: lattner
Date: Wed Dec 12 12:19:52 2007
New Revision: 44945

URL: http://llvm.org/viewvc/llvm-project?rev=44945&view=rev
Log:
make it a bit more clear in what way the ivar is consistent.

Modified:
    cfe/trunk/Sema/SemaDeclObjC.cpp
    cfe/trunk/include/clang/Basic/DiagnosticKinds.def

Modified: cfe/trunk/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Sema/SemaDeclObjC.cpp?rev=44945&r1=44944&r2=44945&view=diff

==============================================================================
--- cfe/trunk/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/Sema/SemaDeclObjC.cpp Wed Dec 12 12:19:52 2007
@@ -440,9 +440,9 @@
   }
   
   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

Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=44945&r1=44944&r2=44945&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Wed Dec 12 12:19:52 2007
@@ -436,8 +436,8 @@
      "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,