* pt.c (complete_template_args): Initialize skip properly.

From-SVN: r18791

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 291ceabd208733e52d479124a98d0845fdeefc18..3ebc7f522cc061deb74fdfc594f9b3a7923b7814 100644 (file)
--- 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 3454b6e33a8224284b2f23d7c2f9dd629b97d3e3..6ea32092644c0b5e533c12ffc05a46047575453a 100644 (file)
--- 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))