aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Sema/SemaDeclObjC.cpp4
-rw-r--r--include/clang/Basic/DiagnosticKinds.def4
2 files changed, 4 insertions, 4 deletions
diff --git a/Sema/SemaDeclObjC.cpp b/Sema/SemaDeclObjC.cpp
index 1a56e4822a..b2cad375f8 100644
--- 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 7fec38e800..684141a367 100644
--- 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,