diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-12-20 19:22:21 +0000 |
| commit | 4442605f184427092e64720db15ce89f65f49b78 (patch) | |
| tree | 6aa145823579ffeeb858199e29dc705ad7fe49d6 /clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp | |
| parent | f658e92724a349fa20a45535b40ed28b7575d49a (diff) | |
| download | bcm5719-llvm-4442605f184427092e64720db15ce89f65f49b78.tar.gz bcm5719-llvm-4442605f184427092e64720db15ce89f65f49b78.zip | |
Revert r170500. It over-zealously converted *ALL* things named Attributes, which is wrong here.
llvm-svn: 170721
Diffstat (limited to 'clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp')
| -rw-r--r-- | clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp index 434cea506aa..81e334e2126 100644 --- a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp +++ b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp @@ -894,10 +894,10 @@ void RewriteModernObjC::RewritePropertyImplDecl(ObjCPropertyImplDecl *PID, if (!OID) return; - unsigned Attribute = PD->getPropertyAttributes(); + unsigned Attributes = PD->getPropertyAttributes(); if (mustSynthesizeSetterGetterMethod(IMD, PD, true /*getter*/)) { - bool GenGetProperty = !(Attribute & ObjCPropertyDecl::OBJC_PR_nonatomic) && - (Attribute & (ObjCPropertyDecl::OBJC_PR_retain | + bool GenGetProperty = !(Attributes & ObjCPropertyDecl::OBJC_PR_nonatomic) && + (Attributes & (ObjCPropertyDecl::OBJC_PR_retain | ObjCPropertyDecl::OBJC_PR_copy)); std::string Getr; if (GenGetProperty && !objcGetPropertyDefined) { @@ -956,7 +956,7 @@ void RewriteModernObjC::RewritePropertyImplDecl(ObjCPropertyImplDecl *PID, // Generate the 'setter' function. std::string Setr; - bool GenSetProperty = Attribute & (ObjCPropertyDecl::OBJC_PR_retain | + bool GenSetProperty = Attributes & (ObjCPropertyDecl::OBJC_PR_retain | ObjCPropertyDecl::OBJC_PR_copy); if (GenSetProperty && !objcSetPropertyDefined) { objcSetPropertyDefined = true; @@ -976,11 +976,11 @@ void RewriteModernObjC::RewritePropertyImplDecl(ObjCPropertyImplDecl *PID, Setr += ", (id)"; Setr += PD->getName(); Setr += ", "; - if (Attribute & ObjCPropertyDecl::OBJC_PR_nonatomic) + if (Attributes & ObjCPropertyDecl::OBJC_PR_nonatomic) Setr += "0, "; else Setr += "1, "; - if (Attribute & ObjCPropertyDecl::OBJC_PR_copy) + if (Attributes & ObjCPropertyDecl::OBJC_PR_copy) Setr += "1)"; else Setr += "0)"; |
