diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-08-17 13:26:14 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-08-17 13:26:14 +0000 |
| commit | 105d8e1f6eb32ba2199548f2f6b0a01d92bd3201 (patch) | |
| tree | 9fc6ddade6b5dbebfad8df9b1cf19c586fa4c8d2 | |
| parent | 5e76004e062f06a6a17a4933537e9a7b6732ae28 (diff) | |
| download | gcc-105d8e1f6eb32ba2199548f2f6b0a01d92bd3201.zip gcc-105d8e1f6eb32ba2199548f2f6b0a01d92bd3201.tar.gz gcc-105d8e1f6eb32ba2199548f2f6b0a01d92bd3201.tar.bz2 | |
class.c (instantiate_type): Reinstate local variable deleted in previous change.
* class.c (instantiate_type): Reinstate local variable
deleted in previous change.
From-SVN: r35758
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/class.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a3ad3fa..98db77a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2000-08-17 Nathan Sidwell <nathan@codesourcery.com> + * class.c (instantiate_type): Reinstate local variable + deleted in previous change. + +2000-08-17 Nathan Sidwell <nathan@codesourcery.com> + * cp-tree.h (instantiate_type_flags): New enumeration. (instantiate_type): Change parameter. * class.c (instantiate_type): Adjust prototype. Adjust. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index f9c27ab..08099c1 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -5993,7 +5993,8 @@ instantiate_type (lhstype, rhs, flags) int complain = (flags & itf_complain); int strict = (flags & itf_no_attributes) ? COMPARE_NO_ATTRIBUTES : COMPARE_STRICT; - + tree r; + if (TREE_CODE (lhstype) == UNKNOWN_TYPE) { if (complain) |