decl.c (make_typename_type): Use my_friendly_assert.

* decl.c (make_typename_type): Use my_friendly_assert.
	* pt.c (tsubst_aggr_type): Rearrange context substitution.

From-SVN: r70475
This commit is contained in:
Nathan Sidwell 2003-08-15 10:23:46 +00:00 committed by Nathan Sidwell
parent ab0ba00c84
commit 4f7847cab9
2 changed files with 8 additions and 5 deletions

View File

@ -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.

View File

@ -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: