mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-19 15:19:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

* class.c (duplicate_tag_error): Preserve template information.

Browse Source 
From-SVN: r28473
This commit is contained in:
Nathan Sidwell 1999-08-03 14:45:20 +00:00 committed by Nathan Sidwell
parent 8e64077dd3
commit 13bd123dfb
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/cp/ChangeLog
View File

@ -1,3 +1,7 @@
1999-08-03 Nathan Sidwell <nathan@acm.org>
* class.c (duplicate_tag_error): Preserve template information.
1999-08-03 Nathan Sidwell <nathan@acm.org> 1999-08-03 Nathan Sidwell <nathan@acm.org>
* decl.c (start_enum): Show location of previous definition. * decl.c (start_enum): Show location of previous definition.

4
gcc/cp/class.c
View File

@ -2205,6 +2205,8 @@ duplicate_tag_error (t)
tree binfo = TYPE_BINFO (t); tree binfo = TYPE_BINFO (t);
int interface_only = CLASSTYPE_INTERFACE_ONLY (t); int interface_only = CLASSTYPE_INTERFACE_ONLY (t);
int interface_unknown = CLASSTYPE_INTERFACE_UNKNOWN (t); int interface_unknown = CLASSTYPE_INTERFACE_UNKNOWN (t);
tree template_info = CLASSTYPE_TEMPLATE_INFO (t);
int use_template = CLASSTYPE_USE_TEMPLATE (t);
bzero ((char *) TYPE_LANG_SPECIFIC (t), sizeof (struct lang_type)); bzero ((char *) TYPE_LANG_SPECIFIC (t), sizeof (struct lang_type));
BINFO_BASETYPES(binfo) = NULL_TREE; BINFO_BASETYPES(binfo) = NULL_TREE;
@ -2213,6 +2215,8 @@ duplicate_tag_error (t)
CLASSTYPE_INTERFACE_ONLY (t) = interface_only; CLASSTYPE_INTERFACE_ONLY (t) = interface_only;
SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, interface_unknown); SET_CLASSTYPE_INTERFACE_UNKNOWN_X (t, interface_unknown);
TYPE_REDEFINED (t) = 1; TYPE_REDEFINED (t) = 1;
CLASSTYPE_TEMPLATE_INFO (t) = template_info;
CLASSTYPE_USE_TEMPLATE (t) = use_template;
} }
TYPE_SIZE (t) = NULL_TREE; TYPE_SIZE (t) = NULL_TREE;
TYPE_MODE (t) = VOIDmode; TYPE_MODE (t) = VOIDmode;