aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/objc/ChangeLog5
-rw-r--r--gcc/objc/objc-act.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog
index c78ca37..743764b 100644
--- a/gcc/objc/ChangeLog
+++ b/gcc/objc/ChangeLog
@@ -1,5 +1,10 @@
2010-05-25 Nathan Froyd <froydnj@codesourcery.com>
+ * objc-act.c (objc_build_constructor): Adjust OBJCPLUS impedance
+ mismatch code for VECs.
+
+2010-05-25 Nathan Froyd <froydnj@codesourcery.com>
+
* objc-act.c (objc_build_constructor): Take a VEC instead of a tree.
Use build_constructor instead of build_constructor_from_list.
(objc_build_string_object): Build a VEC argument for
diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c
index db5862f..5961531 100644
--- a/gcc/objc/objc-act.c
+++ b/gcc/objc/objc-act.c
@@ -2086,7 +2086,7 @@ objc_build_constructor (tree type, VEC(constructor_elt,gc) *elts)
#ifdef OBJCPLUS
/* Adjust for impedance mismatch. We should figure out how to build
CONSTRUCTORs that consistently please both the C and C++ gods. */
- if (!TREE_PURPOSE (elts))
+ if (!VEC_index (constructor_elt, elts, 0)->index)
TREE_TYPE (constructor) = init_list_type_node;
#endif