aboutsummaryrefslogtreecommitdiff
path: root/lib/Sema/SemaObjCProperty.cpp
diff options
context:
space:
mode:
authorFariborz Jahanian <fjahanian@apple.com>2012-08-21 21:52:02 +0000
committerFariborz Jahanian <fjahanian@apple.com>2012-08-21 21:52:02 +0000
commitd9f95b35dc4fc168a167a9b9b61a5f9e1d0462ba (patch)
tree5d40a5a63857aa02f8be05f9cdfc32d5c4b7b1e7 /lib/Sema/SemaObjCProperty.cpp
parentdad633b0a0955ceb4579e9508224562ad41b6a8d (diff)
change function name in my last patch.
// rdar://12103400 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@162320 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaObjCProperty.cpp')
-rw-r--r--lib/Sema/SemaObjCProperty.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index a8726cb931..e465cd6405 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/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);