From 77ae0541198013236bdaee5658e3c613d149d7a3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 23 Jan 2008 16:23:00 -0500 Subject: [PATCH] * pt.c (tsubst_aggr_type): Correct previous change. From-SVN: r131764 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7d02bb5b1e65..052522bd13d4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-23 Jason Merrill + + * pt.c (tsubst_aggr_type): Correct previous change. + 2008-01-21 Jason Merrill PR c++/33959 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9a6f2fc9cc69..3c301f2adaa3 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6330,7 +6330,8 @@ tsubst_aggr_type (tree t, in_decl, /*entering_scope=*/1); /* If context is a nested class inside a class template, it may still need to be instantiated (c++/33959). */ - complete_type (context); + if (TYPE_P (context)) + complete_type (context); } /* Then, figure out what arguments are appropriate for the -- 2.47.2