From 7cbbfe66968979c45b730e7710efcf85b178c7dc Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 15 Aug 2003 10:23:46 +0000 Subject: * decl.c (make_typename_type): Use my_friendly_assert. * pt.c (tsubst_aggr_type): Rearrange context substitution. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70475 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/pt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gcc/cp/pt.c') diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index edb43d98a81..43ecde04415 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -5565,12 +5565,10 @@ tsubst_aggr_type (tree t, /* First, determine the context for the type we are looking up. */ - if (TYPE_CONTEXT (t) != NULL_TREE) - context = tsubst_aggr_type (TYPE_CONTEXT (t), args, - complain, + context = TYPE_CONTEXT (t); + if (context) + context = tsubst_aggr_type (context, args, complain, in_decl, /*entering_scope=*/1); - else - context = NULL_TREE; /* Then, figure out what arguments are appropriate for the type we are trying to find. For example, given: -- cgit v1.2.1