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/Sema/SemaExpr.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/Sema/SemaExpr.cpp')
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index adc1331a9f..3fdfb63c10 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -4053,7 +4053,7 @@ ExprResult Sema::CheckCastTypes(SourceLocation CastStartLoc, SourceRange TyR, ExprPtr->getPointeeType()->isObjCLifetimeType() && !CastQuals.compatiblyIncludesObjCLifetime(ExprQuals)) { Diag(castExpr->getLocStart(), - diag::err_typecheck_incompatible_lifetime) + diag::err_typecheck_incompatible_ownership) << castExprType << castType << AA_Casting << castExpr->getSourceRange(); @@ -8587,7 +8587,7 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, } else if (lhq.getObjCLifetime() != rhq.getObjCLifetime()) { - DiagKind = diag::err_typecheck_incompatible_lifetime; + DiagKind = diag::err_typecheck_incompatible_ownership; break; } |