diff options
author | Jason Merrill <jason@yorick.cygnus.com> | 1998-07-06 18:24:46 +0000 |
---|---|---|
committer | Jason Merrill <jason@gcc.gnu.org> | 1998-07-06 14:24:46 -0400 |
commit | 6c011b01ce31ae105faef46b7d6c583533269a8e (patch) | |
tree | 6674f65ee8fdde672cfc8b05ea395c5ce725acca /gcc | |
parent | 092f7be3b124e3e0ca97600c82adedcc0ecd4132 (diff) | |
download | gcc-6c011b01ce31ae105faef46b7d6c583533269a8e.zip gcc-6c011b01ce31ae105faef46b7d6c583533269a8e.tar.gz gcc-6c011b01ce31ae105faef46b7d6c583533269a8e.tar.bz2 |
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
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/cp/decl.c | 2 | ||||
-rw-r--r-- | gcc/cp/tree.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f57a473..ecd9e84 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +1998-07-06 Jason Merrill <jason@yorick.cygnus.com> + + * decl.c (lookup_tag): Use CP_DECL_CONTEXT. + + * tree.c (make_binfo): Fix length. + 1998-06-30 Benjamin Kosnik <bkoz@bliss.nabi.net> * decl2.c (lang_decode_option): Remove warn_template_debugging. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 5121863..2136417 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 05c54fa..87a64a3 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) |