[cfe-commits] r162320 - /cfe/trunk/lib/Sema/SemaObjCProperty.cpp

[Fariborz Jahanian]

Author: fjahanian
Date: Tue Aug 21 16:52:02 2012
New Revision: 162320

URL: http://llvm.org/viewvc/llvm-project?rev=162320&view=rev
Log:
change function name in my last patch.
// rdar://12103400

Modified:
    cfe/trunk/lib/Sema/SemaObjCProperty.cpp

Modified: cfe/trunk/lib/Sema/SemaObjCProperty.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaObjCProperty.cpp?rev=162320&r1=162319&r2=162320&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaObjCProperty.cpp (original)
+++ cfe/trunk/lib/Sema/SemaObjCProperty.cpp Tue Aug 21 16:52:02 2012
@@ -241,7 +241,7 @@
   
 }
 
-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 @@
   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);