diff options
| author | Jason Merrill <jason@yorick.cygnus.com> | 1998-03-23 23:15:44 +0000 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-03-23 18:15:44 -0500 |
| commit | 9c65eeca37b1a6d9661d23b55d7837019c176609 (patch) | |
| tree | 660cf0c528e4f6608cb05e3d968466a7e95dc3c7 | |
| parent | b3709d9b81438a2577bcba6271e45c53553b584e (diff) | |
| download | gcc-9c65eeca37b1a6d9661d23b55d7837019c176609.zip gcc-9c65eeca37b1a6d9661d23b55d7837019c176609.tar.gz gcc-9c65eeca37b1a6d9661d23b55d7837019c176609.tar.bz2 | |
* pt.c (complete_template_args): Initialize skip properly.
From-SVN: r18791
| -rw-r--r-- | gcc/cp/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 291ceab..3ebc7f5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ Mon Mar 23 12:24:37 1998 Jason Merrill <jason@yorick.cygnus.com> + * pt.c (complete_template_args): Initialize skip properly. + * decl.c (make_typename_type): Revert. (make_implicit_typename): Remove. (lookup_name_real): Don't call it. Call lookup_field if we see a diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 3454b6e..6ea3209 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -411,10 +411,9 @@ complete_template_args (tmpl, extra_args, unbound_only) new_args = make_tree_vec (depth + 1); - if (! is_member_template (tmpl)) - /* If this isn't a member template, extra_args is for the innermost - template class, so skip over it. */ - skip = 1; + /* If this isn't a member template, extra_args is for the innermost + template class, so skip over it. */ + skip = (! is_member_template (tmpl)); type = DECL_REAL_CONTEXT (tmpl); for (i = depth; i; type = TYPE_CONTEXT (type)) |