zlaski 02/08/28 12:56:56
Modified: gcc/objc objc-act.c
Log:
Rescue an orphaned ObjC++ hunk; remove APPLE LOCAL markers that are no longer
needed.
Bug #:
Revision Changes Path
1.113 +9 -11 gcc3/gcc/objc/objc-act.c
Index: objc-act.c
===================================================================
RCS file: /cvs/Darwin/gcc3/gcc/objc/objc-act.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- objc-act.c 2002/08/28 18:23:31 1.112
+++ objc-act.c 2002/08/28 19:56:56 1.113
@@ -2643,7 +2643,15 @@
tree interface = lookup_interface (class_name);
if (interface)
- return get_class_ivars (interface);
+ {
+ tree ivar = get_class_ivars (interface);
+#ifdef OBJCPLUS
+ /* finish_member_declaration takes only one decl at a time */
+ for (; ivar; ivar = TREE_CHAIN (ivar))
+ finish_member_declaration (copy_node (ivar));
+#endif
+ return ivar;
+ }
else
{
error ("cannot find interface declaration for `%s'",
@@ -2704,14 +2712,6 @@
ivar_chain = head;
}
}
-#ifdef OBJCPLUS
- {
- tree ivar = ivar_chain;
- /* finish_member_declaration takes only one decl at a time */
- for (; ivar; ivar = TREE_CHAIN (ivar))
- finish_member_declaration (copy_node (ivar));
- }
-#endif
return ivar_chain;
}
@@ -7832,7 +7832,6 @@
{
super_class = get_class_reference (super_name);
if (TREE_CODE (objc_method_context) == CLASS_METHOD_DECL)
- /* APPLE LOCAL begin call super */
/* Cast the super class to 'id', since the user may not have
included <objc/objc-class.h>, leaving 'struct objc_class'
an incomplete type. */
@@ -7840,7 +7839,6 @@
= build_component_ref (build_indirect_ref
(build_c_cast (id_type, super_class), "->"),
get_identifier ("isa"));
- /* APPLE LOCAL end super call */
}
else
{
