From 9c65eeca37b1a6d9661d23b55d7837019c176609 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 23 Mar 1998 23:15:44 +0000 Subject: [PATCH] * pt.c (complete_template_args): Initialize skip properly. From-SVN: r18791 --- gcc/cp/ChangeLog | 2 ++ gcc/cp/pt.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 291ceabd208..3ebc7f522cc 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,7 @@ Mon Mar 23 12:24:37 1998 Jason Merrill + * 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 3454b6e33a8..6ea32092644 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)) -- 2.30.2