diff options
author | Gabriel Dos Reis <gdr@integrable-solutions.net> | 2003-09-23 15:42:21 +0000 |
---|---|---|
committer | Gabriel Dos Reis <gdr@gcc.gnu.org> | 2003-09-23 15:42:21 +0000 |
commit | ac20c67af10d2f8aadabeb255ff66f31364e9e6d (patch) | |
tree | 7ed60f69034fa22ef77ea47b08b2a73bc35cf78c /gcc/cp/semantics.c | |
parent | 3504b199c283afd4d48cbd0f786fa6fd33a11a13 (diff) | |
download | gcc-ac20c67af10d2f8aadabeb255ff66f31364e9e6d.zip gcc-ac20c67af10d2f8aadabeb255ff66f31364e9e6d.tar.gz gcc-ac20c67af10d2f8aadabeb255ff66f31364e9e6d.tar.bz2 |
cp-tree.h (scope_kind): Add new enumerator.
* cp-tree.h (scope_kind): Add new enumerator.
(keep_next_level): Change parameter type to bool.
(begin_scope): Change prototype.
(pushlevel): Remove declaration.
* decl.c (push_binding_level): Fold in begin_scope. Remove.
(struct cp_binding_level): Remove tag_tranparent field. Make keep
of bitsize one.
(keep_next_level_flag): Make a bool.
(cxx_scope_descriptor): Update scope names table
(make_cxx_scope): Fold in begin_scope. Remove..
(namespace_scope_ht_size): New function.
(begin_scope): Change prototype. Return a scope. Tidy.
(kept_level_p): Update.
(pushlevel): Remove.
(maybe_push_cleanup_level): Simplify.
(poplevel): Update for sk_cleanup and keep change.
(print_binding_level): Likewise.
(initial_push_namespace_scope): Fold in begin_scope. Remove.
(push_namespace): Update.
(pushtag): Likewise.
(lookup_tag): Likewise.
(lookup_name_current_level): Likewise.
(lookup_type_current_level): Likewise.
(cxx_init_decl_processing): Likewise.
(start_function): Likewise.
(begin_function_body): Likewise.
(start_method): Likewise.
* pt.c (push_inline_template_parms_recursive): Likewise.
(begin_template_parm_list): Likewise.
(begin_specialization): Likewise.
* semantics.c (do_pushlevel): Likewise.
(begin_compound_stmt): Likewise.
(begin_stmt_expr): Likewise.
From-SVN: r71683
Diffstat (limited to 'gcc/cp/semantics.c')
-rw-r--r-- | gcc/cp/semantics.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index ef42579..6650bff 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -360,7 +360,7 @@ do_pushlevel (scope_kind sk) { if (!processing_template_decl) add_scope_stmt (/*begin_p=*/1, /*partial_p=*/0); - begin_scope (sk); + begin_scope (sk, NULL); } } @@ -1004,7 +1004,7 @@ begin_compound_stmt (bool has_no_scope) statement-expression. But, if it's a statement-expression with a scopeless block, there's nothing to keep, and we don't want to accidentally keep a block *inside* the scopeless block. */ - keep_next_level (0); + keep_next_level (false); return r; } @@ -1408,7 +1408,7 @@ begin_stmt_expr (void) last_expr_type = NULL_TREE; - keep_next_level (1); + keep_next_level (true); return last_tree; } |