commit b8b0313e84700b5c6d597b3be4de41c97b7550f1
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jun 24 00:08:59 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jun 24 00:08:59 2011 +0000
tree b72d09eb3de6cb951acc9770ef623c9836bdf143
parent a81397323cc8475ef8243f938118a9c231fb18ff

Rename objc_lifetime -> objc_ownership, and modify diagnostics to talk about 'ownership', not 'lifetime'.

rdar://9477613.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133779 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/SemaObjCProperty.cpp

diff --git a/lib/Sema/SemaObjCProperty.cpp b/lib/Sema/SemaObjCProperty.cpp
index 2dbb740..75ff0d1 100644
--- a/lib/Sema/SemaObjCProperty.cpp
+++ b/lib/Sema/SemaObjCProperty.cpp
@@ -63,7 +63,7 @@
 
   property->setInvalidDecl();
   S.Diag(property->getLocation(),
-         diag::err_arc_inconsistent_property_lifetime)
+         diag::err_arc_inconsistent_property_ownership)
     << property->getDeclName()
     << selector
     << propertyLifetime;
@@ -420,7 +420,7 @@
 
     case Qualifiers::OCL_ExplicitNone:
     case Qualifiers::OCL_Weak:
-      S.Diag(propertyImplLoc, diag::err_arc_strong_property_lifetime)
+      S.Diag(propertyImplLoc, diag::err_arc_strong_property_ownership)
         << property->getDeclName()
         << ivar->getDeclName()
         << ivarLifetime;
@@ -463,7 +463,7 @@
 
     case Qualifiers::OCL_Weak:
     case Qualifiers::OCL_Strong:
-      S.Diag(propertyImplLoc, diag::err_arc_assign_property_lifetime)
+      S.Diag(propertyImplLoc, diag::err_arc_assign_property_ownership)
         << property->getDeclName()
         << ivar->getDeclName();
       break;