diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2008-12-08 18:47:29 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2008-12-08 18:47:29 +0000 |
| commit | 3685995d2ce4b7a7cda5143d536777d152566434 (patch) | |
| tree | 127f5add3e12c14175eb463ff864a9e977501428 /clang/lib/Sema/SemaDeclObjC.cpp | |
| parent | 5daeee2bd66be84eaf764fb789afcb5bf63068bd (diff) | |
| download | bcm5719-llvm-3685995d2ce4b7a7cda5143d536777d152566434.tar.gz bcm5719-llvm-3685995d2ce4b7a7cda5143d536777d152566434.zip | |
Since we do not allow a readonly property to be 'copy'retain', we
must allow the continuation class to extend it to a 'readwrite'
and 'copy/retain'.
llvm-svn: 60709
Diffstat (limited to 'clang/lib/Sema/SemaDeclObjC.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclObjC.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp index 7a93b453f07..828e1fc8c61 100644 --- a/clang/lib/Sema/SemaDeclObjC.cpp +++ b/clang/lib/Sema/SemaDeclObjC.cpp @@ -1388,11 +1388,7 @@ Sema::DeclTy *Sema::ActOnProperty(Scope *S, SourceLocation AtLoc, // with anonymous category's readwrite property attribute! unsigned PIkind = PIDecl->getPropertyAttributes(); if (isReadWrite && (PIkind & ObjCPropertyDecl::OBJC_PR_readonly)) { - if ((Attributes & ObjCPropertyDecl::OBJC_PR_retain) != - (PIkind & ObjCPropertyDecl::OBJC_PR_retain) || - (Attributes & ObjCPropertyDecl::OBJC_PR_copy) != - (PIkind & ObjCPropertyDecl::OBJC_PR_copy) || - (Attributes & ObjCPropertyDecl::OBJC_PR_nonatomic) != + if ((Attributes & ObjCPropertyDecl::OBJC_PR_nonatomic) != (PIkind & ObjCPropertyDecl::OBJC_PR_nonatomic)) Diag(AtLoc, diag::warn_property_attr_mismatch); PIDecl->makeitReadWriteAttribute(); |
