summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaPseudoObject.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-05-26 16:10:06 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-05-26 16:10:06 +0000
commitf3b7681f2bc72c64837abffab67b9d53110002ac (patch)
tree8f58512295d9a274d92894acd59c7c86973c2fba /clang/lib/Sema/SemaPseudoObject.cpp
parent58abf4f1932b19d1cb84c2bed938f9194f063d80 (diff)
downloadbcm5719-llvm-f3b7681f2bc72c64837abffab67b9d53110002ac.tar.gz
bcm5719-llvm-f3b7681f2bc72c64837abffab67b9d53110002ac.zip
Change warning to error when property setter names conflict.
// rdar://11528439 llvm-svn: 157517
Diffstat (limited to 'clang/lib/Sema/SemaPseudoObject.cpp')
-rw-r--r--clang/lib/Sema/SemaPseudoObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaPseudoObject.cpp b/clang/lib/Sema/SemaPseudoObject.cpp
index 82bf79b3666..4921ec9bfe9 100644
--- a/clang/lib/Sema/SemaPseudoObject.cpp
+++ b/clang/lib/Sema/SemaPseudoObject.cpp
@@ -543,7 +543,7 @@ bool ObjCPropertyOpBuilder::findSetter(bool warn) {
IdentifierInfo *AltMember = &S.PP.getIdentifierTable().get(PropertyName);
if (ObjCPropertyDecl *prop1 = IFace->FindPropertyDeclaration(AltMember))
if (prop != prop1 && (prop1->getSetterMethodDecl() == setter)) {
- S.Diag(RefExpr->getExprLoc(), diag::warn_property_setter_ambiguous_use)
+ S.Diag(RefExpr->getExprLoc(), diag::error_property_setter_ambiguous_use)
<< prop->getName() << prop1->getName() << setter->getSelector();
S.Diag(prop->getLocation(), diag::note_property_declare);
S.Diag(prop1->getLocation(), diag::note_property_declare);
OpenPOWER on IntegriCloud