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/pt.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/pt.c')
| -rw-r--r-- | gcc/cp/pt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 12baea1..aad6c60 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -352,7 +352,8 @@ push_inline_template_parms_recursive (tree parmlist, int levels) parms, current_template_parms); TEMPLATE_PARMS_FOR_INLINE (current_template_parms) = 1; - pushlevel (0); + begin_scope (TREE_VEC_LENGTH (parms) ? sk_template_parms : sk_template_spec, + NULL); for (i = 0; i < TREE_VEC_LENGTH (parms); ++i) { tree parm = TREE_VALUE (TREE_VEC_ELT (parms, i)); @@ -609,7 +610,7 @@ begin_template_parm_list (void) pushtag contains special code to call pushdecl_with_scope on the TEMPLATE_DECL for S2. */ - begin_scope (sk_template_parms); + begin_scope (sk_template_parms, NULL); ++processing_template_decl; ++processing_template_parmlist; note_template_header (0); @@ -653,7 +654,7 @@ check_specialization_scope (void) void begin_specialization (void) { - begin_scope (sk_template_spec); + begin_scope (sk_template_spec, NULL); note_template_header (1); check_specialization_scope (); } |