diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e7e0edd..8f188b6 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2003-08-15 Nathan Sidwell <nathan@codesourcery.com> + + * decl.c (make_typename_type): Use my_friendly_assert. + * pt.c (tsubst_aggr_type): Rearrange context substitution. + Thu Aug 14 12:19:25 CEST 2003 Jan Hubicka <jh@suse.cz> * method.c (use_thunk): Expand body directly. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index edb43d9..43ecde0 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: |