gkeating 02/10/29 07:50:45
Modified: live/gcc3/gcc c-lang.c stub-objc.c
live/gcc3/gcc/cp pt.c
Log:
Correct merge problem with objc_is_id
Revision Changes Path
1.32 +1 -6 src/live/gcc3/gcc/c-lang.c
Index: c-lang.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/c-lang.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- c-lang.c 2002/10/24 23:42:40 1.31
+++ c-lang.c 2002/10/29 15:50:44 1.32
@@ -202,12 +202,7 @@
/* APPLE LOCAL move is_class_name to stub-objc.c */
-tree
-objc_is_id (arg)
- tree arg ATTRIBUTE_UNUSED;
-{
- return 0;
-}
+/* APPLE LOCAL move objc_is_id to stub-objc.c. */
void
objc_check_decl (decl)
1.9 +1 -1 src/live/gcc3/gcc/stub-objc.c
Index: stub-objc.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/stub-objc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- stub-objc.c 2002/08/26 05:39:47 1.8
+++ stub-objc.c 2002/10/29 15:50:44 1.9
@@ -42,7 +42,7 @@
}
tree
-is_id (arg)
+objc_is_id (arg)
tree arg ATTRIBUTE_UNUSED;
{
return 0;
1.32 +1 -1 src/live/gcc3/gcc/cp/pt.c
Index: pt.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cp/pt.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pt.c 2002/10/24 23:46:49 1.31
+++ pt.c 2002/10/29 15:50:44 1.32
@@ -4541,7 +4541,7 @@
/* Handle ObjC protocols, which happen to be stored in the same
place (TREE-wise) as template parms, but which clearly aren't
templates. */
- if (flag_objc && (is_id (t) || is_class_name (t)))
+ if (flag_objc && (objc_is_id (t) || is_class_name (t)))
return 0;
/* APPLE LOCAl end Objective-C++ */
