diff options
| author | Jason Merrill <jason@redhat.com> | 2008-01-23 16:23:00 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2008-01-23 16:23:00 -0500 |
| commit | 77ae0541198013236bdaee5658e3c613d149d7a3 (patch) | |
| tree | 72056c10786c848839ca134db9aa0901fa18438f | |
| parent | d00a01e9ee688829183405a1dbc92191ce7eeacc (diff) | |
| download | gcc-77ae0541198013236bdaee5658e3c613d149d7a3.tar.gz | |
* pt.c (tsubst_aggr_type): Correct previous change.
From-SVN: r131764
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7d02bb5b1e6..052522bd13d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-23 Jason Merrill <jason@redhat.com> + + * pt.c (tsubst_aggr_type): Correct previous change. + 2008-01-21 Jason Merrill <jason@redhat.com> PR c++/33959 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9a6f2fc9cc6..3c301f2adaa 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 |