diff options
author | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-21 21:52:02 +0000 |
---|---|---|
committer | Fariborz Jahanian <fjahanian@apple.com> | 2012-08-21 21:52:02 +0000 |
commit | ea262f7936a7ae48f19362a1c2ad3d3c23e54498 (patch) | |
tree | 2c4c472a6e1a9a24b537400ddb74cf312d1c62aa /clang | |
parent | 8d1ca5a142328fba3880a02cf8a36e9f648ac536 (diff) | |
download | bcm5719-llvm-ea262f7936a7ae48f19362a1c2ad3d3c23e54498.tar.gz bcm5719-llvm-ea262f7936a7ae48f19362a1c2ad3d3c23e54498.zip |
change function name in my last patch.
// rdar://12103400
llvm-svn: 162320
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/Sema/SemaObjCProperty.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaObjCProperty.cpp b/clang/lib/Sema/SemaObjCProperty.cpp index a8726cb9316..e465cd64058 100644 --- a/clang/lib/Sema/SemaObjCProperty.cpp +++ b/clang/lib/Sema/SemaObjCProperty.cpp @@ -241,7 +241,7 @@ static bool LocPropertyAttribute( ASTContext &Context, const char *attrName, } -static unsigned getMemoryModel(unsigned attr) { +static unsigned getOwnershipRule(unsigned attr) { return attr & (ObjCPropertyDecl::OBJC_PR_assign | ObjCPropertyDecl::OBJC_PR_retain | ObjCPropertyDecl::OBJC_PR_copy | @@ -357,8 +357,8 @@ Sema::HandlePropertyInClassExtension(Scope *S, unsigned PIkind = PIDecl->getPropertyAttributesAsWritten(); if (isReadWrite && (PIkind & ObjCPropertyDecl::OBJC_PR_readonly)) { PIkind |= deduceWeakPropertyFromType(*this, PIDecl->getType()); - unsigned ClassExtensionMemoryModel = getMemoryModel(Attributes); - unsigned PrimaryClassMemoryModel = getMemoryModel(PIkind); + unsigned ClassExtensionMemoryModel = getOwnershipRule(Attributes); + unsigned PrimaryClassMemoryModel = getOwnershipRule(PIkind); if (PrimaryClassMemoryModel && ClassExtensionMemoryModel && (PrimaryClassMemoryModel != ClassExtensionMemoryModel)) { Diag(AtLoc, diag::warn_property_attr_mismatch); |