From 6c011b01ce31ae105faef46b7d6c583533269a8e Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 6 Jul 1998 18:24:46 +0000 Subject: [PATCH] decl.c (lookup_tag): Use CP_DECL_CONTEXT. * decl.c (lookup_tag): Use CP_DECL_CONTEXT. * tree.c (make_binfo): Fix length. From-SVN: r20954 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 2 +- gcc/cp/tree.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f57a473c2f8..ecd9e843889 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +1998-07-06 Jason Merrill + + * decl.c (lookup_tag): Use CP_DECL_CONTEXT. + + * tree.c (make_binfo): Fix length. + 1998-06-30 Benjamin Kosnik * decl2.c (lang_decode_option): Remove warn_template_debugging. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 51218633ad0..2136417edcb 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -4414,7 +4414,7 @@ lookup_tag (form, name, binding_level, thislevel_only) else if (level->namespace_p) /* Do namespace lookup. */ /* XXX: is this a real lookup, considering using-directives etc. ??? */ - for (tail = current_namespace; 1; tail = DECL_CONTEXT (tail)) + for (tail = current_namespace; 1; tail = CP_DECL_CONTEXT (tail)) { tree old = BINDING_TYPE (binding_for_name (name, tail)); /* If it has an original type, it is a typedef, and we diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 05c54fa7e64..87a64a3d969 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1186,7 +1186,7 @@ make_binfo (offset, binfo, vtable, virtuals, chain) tree vtable, virtuals; tree chain; { - tree new_binfo = make_tree_vec (6); + tree new_binfo = make_tree_vec (7); tree type; if (TREE_CODE (binfo) == TREE_VEC) -- 2.30.2