diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-06-24 00:08:59 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2011-06-24 00:08:59 +0000 |
| commit | b8b0313e84700b5c6d597b3be4de41c97b7550f1 (patch) | |
| tree | b72d09eb3de6cb951acc9770ef623c9836bdf143 /lib/ARCMigrate/TransProperties.cpp | |
| parent | a81397323cc8475ef8243f938118a9c231fb18ff (diff) | |
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
Diffstat (limited to 'lib/ARCMigrate/TransProperties.cpp')
| -rw-r--r-- | lib/ARCMigrate/TransProperties.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ARCMigrate/TransProperties.cpp b/lib/ARCMigrate/TransProperties.cpp index 2122e03700..e0009ac241 100644 --- a/lib/ARCMigrate/TransProperties.cpp +++ b/lib/ARCMigrate/TransProperties.cpp @@ -116,7 +116,7 @@ public: Transaction Trans(Pass.TA); Pass.TA.insert(prop.IvarD->getLocation(), "__weak "); - Pass.TA.clearDiagnostic(diag::err_arc_assign_property_lifetime, + Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership, prop.ArcPropAssignErrorLoc); } @@ -126,7 +126,7 @@ public: if (PI->ShouldChangeToWeak) { Transaction Trans(Pass.TA); Pass.TA.insert(PI->IvarD->getLocation(), "__unsafe_unretained "); - Pass.TA.clearDiagnostic(diag::err_arc_assign_property_lifetime, + Pass.TA.clearDiagnostic(diag::err_arc_assign_property_ownership, PI->ArcPropAssignErrorLoc); } } @@ -151,7 +151,7 @@ public: != Qualifiers::OCL_Strong) return true; if (!Pass.TA.hasDiagnostic( - diag::err_arc_assign_property_lifetime, D->getLocation())) + diag::err_arc_assign_property_ownership, D->getLocation())) return true; // There is a "error: existing ivar for assign property must be @@ -162,7 +162,7 @@ public: Transaction Trans(Pass.TA); Pass.TA.insert(ivarD->getLocation(), "__unsafe_unretained "); Pass.TA.clearDiagnostic( - diag::err_arc_assign_property_lifetime, D->getLocation()); + diag::err_arc_assign_property_ownership, D->getLocation()); } else { // Mark that we want the ivar to become weak. unsigned loc = SM.getInstantiationLoc(propD->getAtLoc()).getRawEncoding(); |