gkeating 02/10/25 19:45:58
Modified: live/gcc3/gcc/cp decl2.c typeck2.c
Log:
Cleanup after merge.
Revision Changes Path
1.96 +0 -1 src/live/gcc3/gcc/cp/decl2.c
Index: decl2.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cp/decl2.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- decl2.c 2002/10/24 23:46:40 1.95
+++ decl2.c 2002/10/26 02:45:51 1.96
@@ -2843,7 +2843,6 @@
if (walk_vtables (vtable_decl_p,
finish_vtable_vardecl,
/*data=*/0))
- /* APPLE LOCAL end cp_binding_level dpatel */
reconsider = 1;
/* Write out needed type info variables. Writing out one variable
1.16 +0 -3 src/live/gcc3/gcc/cp/typeck2.c
Index: typeck2.c
===================================================================
RCS file: /cvs/Darwin/src/live/gcc3/gcc/cp/typeck2.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- typeck2.c 2002/10/24 23:46:57 1.15
+++ typeck2.c 2002/10/26 02:45:53 1.16
@@ -463,9 +463,6 @@
if (TREE_CODE (init) == NON_LVALUE_EXPR)
init = TREE_OPERAND (init, 0);
- if (TREE_CODE (init) == CONSTRUCTOR && TREE_TYPE (init) == type)
- return init;
-
raw_constructor = (TREE_CODE (init) == CONSTRUCTOR
&& TREE_HAS_CONSTRUCTOR (init));
