aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/init.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2002-01-22 09:42:09 -0500
committerJason Merrill <jason@gcc.gnu.org>2002-01-22 09:42:09 -0500
commitb58564754b8f157067e661a00c83c8fd9c75dc54 (patch)
tree3d7cb8c1f3c21239a3a8a7046c8a953c2a4a34a0 /gcc/cp/init.c
parent6bc34b14ef3f254de4bf8570d1282d1cfd89c134 (diff)
downloadgcc-b58564754b8f157067e661a00c83c8fd9c75dc54.zip
gcc-b58564754b8f157067e661a00c83c8fd9c75dc54.tar.gz
gcc-b58564754b8f157067e661a00c83c8fd9c75dc54.tar.bz2
parse.y (function_body): Suppress the block for the outermost curly braces.
* parse.y (function_body): Suppress the block for the outermost curly braces. * decl.c (pushdecl): Don't try to skip it. (begin_function_body): Keep the block we create, not the next one. * init.c (emit_base_init): Don't mess with keep_next_level. From-SVN: r49076
Diffstat (limited to 'gcc/cp/init.c')
-rw-r--r--gcc/cp/init.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index 3aaedaf..f159f44 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -668,11 +668,6 @@ emit_base_init (mem_init_list, base_init_list)
int i;
int n_baseclasses = BINFO_N_BASETYPES (t_binfo);
- /* We did a keep_next_level (1) in begin_function_body. We don't want
- that to apply to any blocks generated for member initializers, so
- clear it out. */
- keep_next_level (0);
-
mem_init_list = sort_member_init (t, mem_init_list);
sort_base_init (t, base_init_list, &rbase_init_list, &vbase_init_list);
@@ -753,9 +748,6 @@ emit_base_init (mem_init_list, base_init_list)
perform_member_init (member, init, from_init_list);
mem_init_list = TREE_CHAIN (mem_init_list);
}
-
- /* And restore it. */
- keep_next_level (1);
}
/* Returns the address of the vtable (i.e., the value that should be