diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-19 09:27:34 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-01-19 09:27:34 +0000 |
| commit | b36ebdb3113abd65e75be71f70e796772fbca867 (patch) | |
| tree | 1d55f1cfe1b3c7696c7a34b9b0c7ae711cecb171 | |
| parent | f8ce2bac3e6874ae5cb8699e673f54be2dd5c104 (diff) | |
| download | ppe42-gcc-b36ebdb3113abd65e75be71f70e796772fbca867.tar.gz ppe42-gcc-b36ebdb3113abd65e75be71f70e796772fbca867.zip | |
cp:
* class.c (duplicate_tag_error): Robustify flag clearing.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39130 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/class.c | 29 |
2 files changed, 14 insertions, 19 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 69e74738cca..b81617e82f4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2001-01-19 Nathan Sidwell <nathan@codesourcery.com> + * class.c (duplicate_tag_error): Robustify flag clearing. + +2001-01-19 Nathan Sidwell <nathan@codesourcery.com> + * cp-tree.h (lookup_template_class): Add complain parm. * decl.c (lookup_namespace_name): Adjust call to lookup_template_class. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 888e8ae6c53..423fb32671d 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -2375,25 +2375,16 @@ duplicate_tag_error (t) TYPE_CONTEXT (t) = NULL_TREE; TYPE_NONCOPIED_PARTS (t) = NULL_TREE; - TYPE_HAS_NONTRIVIAL_DESTRUCTOR (t) = 0; - TYPE_HAS_CONSTRUCTOR (t) = 0; - TYPE_HAS_DESTRUCTOR (t) = 0; - TYPE_HAS_CONVERSION (t) = 0; - TYPE_HAS_ASSIGN_REF (t) = 0; - TYPE_HAS_CONST_ASSIGN_REF (t) = 0; - TYPE_HAS_INIT_REF (t) = 0; - TYPE_HAS_CONST_INIT_REF (t) = 0; - TYPE_HAS_NEW_OPERATOR (t) = 0; - TYPE_HAS_ARRAY_NEW_OPERATOR (t) = 0; - TYPE_HAS_DEFAULT_CONSTRUCTOR (t) = 0; - CLASSTYPE_HAS_MUTABLE (t) = 0; - CLASSTYPE_NON_POD_P (t) = 0; - CLASSTYPE_NEARLY_EMPTY_P (t) = 0; - CLASSTYPE_NON_AGGREGATE (t) = 0; - TYPE_HAS_REAL_ASSIGN_REF (t) = 0; - TYPE_HAS_COMPLEX_ASSIGN_REF (t) = 0; - TYPE_HAS_ABSTRACT_ASSIGN_REF (t) = 0; - TYPE_HAS_COMPLEX_INIT_REF (t) = 0; + /* Clear TYPE_LANG_FLAGS -- those in TYPE_LANG_SPECIFIC are cleared above. */ + TYPE_LANG_FLAG_0 (t) = 0; + TYPE_LANG_FLAG_1 (t) = 0; + TYPE_LANG_FLAG_2 (t) = 0; + TYPE_LANG_FLAG_3 (t) = 0; + TYPE_LANG_FLAG_4 (t) = 0; + TYPE_LANG_FLAG_5 (t) = 0; + TYPE_LANG_FLAG_6 (t) = 0; + /* But not this one. */ + SET_IS_AGGR_TYPE (t, 1); } /* Make the BINFO's vtablehave N entries, including RTTI entries, |
