aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaDeclObjC.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2008-12-08 19:28:10 +0000
committerFariborz Jahanian <fjahanian@apple.com>2008-12-08 19:28:10 +0000
commitba45da8328b97fe7c9f4d92e377bd3e586b9a79f (patch)
tree37a5d1626206a6f54ba1f1f8e737805a7dcdf923 /lib/Sema/SemaDeclObjC.cpp
parent9bfb2a2cbe3931db9785705c6d476c3089eaeed6 (diff)
Changed 'readonly' 'retain/copy' diagnostics into
warning as it is allowed in gcc and will break projects. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60710 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--lib/Sema/SemaDeclObjC.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index 828e1fc8c6..5e9e2b21e2 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -1299,9 +1299,10 @@ void Sema::CheckObjCPropertyAttributes(QualType PropertyTy,
(Attributes & ObjCDeclSpec::DQ_PR_copy) ?
"copy" : "retain";
- Diag(Loc, diag::err_objc_property_attr_mutually_exclusive)
+ Diag(Loc, (Attributes & (ObjCDeclSpec::DQ_PR_readwrite)) ?
+ diag::err_objc_property_attr_mutually_exclusive :
+ diag::warn_objc_property_attr_mutually_exclusive)
<< "readonly" << which;
- return;
}
// Check for copy or retain on non-object types.