aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2000-07-06 10:28:36 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2000-07-06 10:28:36 +0000
commit84e5ca0f370520168a8b65cd53607393868e993b (patch)
tree9715781a5a95c99416894d277f6e9170a30b79b6 /gcc
parent09074fda4ff8ce7c743c42dea2d22d9f54de35f8 (diff)
downloadgcc-84e5ca0f370520168a8b65cd53607393868e993b.zip
gcc-84e5ca0f370520168a8b65cd53607393868e993b.tar.gz
gcc-84e5ca0f370520168a8b65cd53607393868e993b.tar.bz2
* pt.c (instantiate_pending_templates): Reset template level.
From-SVN: r34886
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/pt.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index cd6c0d7..6386d66 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-06 Nathan Sidwell <nathan@codesourcery.com>
+
+ * pt.c (instantiate_pending_templates): Reset template level.
+
2000-07-05 Jason Merrill <jason@redhat.com>
* call.c (joust): Don't complain about `operator char *()' beating
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 50fdbf0..9f88761 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9813,6 +9813,8 @@ instantiate_pending_templates ()
else
t = &TREE_CHAIN (*t);
}
+ tinst_depth = 0;
+ current_tinst_level = NULL_TREE;
}
template_tail = t;