diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-26 21:21:19 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2011-08-26 21:21:19 +0000 |
| commit | 9414449e299036efbd411d92266983dfc24e24e9 (patch) | |
| tree | f66dd17c76cda39c0b16538d8c1d4c454cf085fa /include/clang | |
| parent | cec52f0623d57f090e3477941acebe4932fa7abd (diff) | |
objc-arc: Mention property's attribute by name when
finding life-time conflict with its declared ivar.
// rdar://10007230
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@138659 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang')
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 3d8fbd37c1..2781675f00 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -2851,7 +2851,8 @@ def err_arc_strong_property_ownership : Error< "existing ivar %1 for strong property %0 may not be " "%select{|__unsafe_unretained||__weak}2">; def err_arc_assign_property_ownership : Error< - "existing ivar %1 for unsafe_unretained property %0 must be __unsafe_unretained">; + "existing ivar %1 for property %0 with %select{unsafe_unretained| assign}2 " + "attribute must be __unsafe_unretained">; def err_arc_inconsistent_property_ownership : Error< "%select{strong|weak|unsafe_unretained}1 property %0 may not also be " "declared %select{|__unsafe_unretained|__strong|__weak|__autoreleasing}2">; |