aboutsummaryrefslogtreecommitdiff
path: root/include/clang/Basic
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2013-01-28 20:13:44 +0000
committerDouglas Gregor <dgregor@apple.com>2013-01-28 20:13:44 +0000
commitbde67cfdf05f7c569661e7a490b0b0811ac1ec56 (patch)
tree2c28f9ddc2082ab1819ada97a16063409ba5608c /include/clang/Basic
parent4581d45405f07374770366be8644d52733985833 (diff)
Undo my re-wording of the "ARC forbids Objective-C objects in ..."
error. Jordan is right. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173713 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/clang/Basic')
-rw-r--r--include/clang/Basic/DiagnosticSemaKinds.td4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td
index 4e48089e38..31a847b129 100644
--- a/include/clang/Basic/DiagnosticSemaKinds.td
+++ b/include/clang/Basic/DiagnosticSemaKinds.td
@@ -3697,8 +3697,8 @@ def err_arc_mismatched_cast : Error<
def err_arc_nolifetime_behavior : Error<
"explicit ownership qualifier on cast result has no effect">;
def err_arc_objc_object_in_tag : Error<
- "ARC forbids %select{Objective-C objects|blocks}0 of type %1 in "
- "%select{struct|interface|union|<<ERROR>>|enum}2">;
+ "ARC forbids %select{Objective-C objects|blocks}0 in "
+ "%select{struct|interface|union|<<ERROR>>|enum}1">;
def err_arc_objc_property_default_assign_on_object : Error<
"ARC forbids synthesizing a property of an Objective-C object "
"with unspecified ownership or storage attribute">;