aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/class.c
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>1999-07-09 07:05:23 -0400
committerJason Merrill <jason@gcc.gnu.org>1999-07-09 07:05:23 -0400
commit6f1b4c42790b1a8083ae217facb58eb3f0cfa819 (patch)
treef2f5e66b69e7e045db05f19c706201f1b67d06f8 /gcc/cp/class.c
parent22b452e755aa611d40f7c9317686ce50ce5c6fff (diff)
downloadgcc-6f1b4c42790b1a8083ae217facb58eb3f0cfa819.zip
gcc-6f1b4c42790b1a8083ae217facb58eb3f0cfa819.tar.gz
gcc-6f1b4c42790b1a8083ae217facb58eb3f0cfa819.tar.bz2
pt.c (do_decl_instantiation): Downgrade duplicate instantiation errors to pedwarn.
* pt.c (do_decl_instantiation): Downgrade duplicate instantiation errors to pedwarn. * typeck.c (comptypes): Simplify C code in look_hard. * xref.c (PALLOC): Use xcalloc, not calloc. (SALLOC): Use xmalloc, not malloc. * rtti.c (synthesize_tinfo_fn): Add missing call to pop_momentary. * search.c (note_debug_info_needed): Don't search if WRITE_SYMBOLS is NO_DEBUG. * decl.c (duplicate_decls): If a redeclaration doesn't match the initial declaration, then don't save the inline info and by all means don't mark the function as a builtin function. * decl.c (lookup_name_real): Set NONCLASS to 1 if CURRENT_CLASS_TYPE is 0. * class.c (duplicate_tag_error): Set TYPE_NONCOPIED_PARTS to NULL_TREE. From-SVN: r28044
Diffstat (limited to 'gcc/cp/class.c')
-rw-r--r--gcc/cp/class.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a04d2a0..4fcb2fd 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -2146,6 +2146,7 @@ duplicate_tag_error (t)
TYPE_METHODS (t) = NULL_TREE;
TYPE_VFIELD (t) = NULL_TREE;
TYPE_CONTEXT (t) = NULL_TREE;
+ TYPE_NONCOPIED_PARTS (t) = NULL_TREE;
}
/* finish up all new vtables. */
@@ -4186,7 +4187,7 @@ finish_struct (t, attributes, warn_anon)
{
finish_struct_methods (t);
TYPE_SIZE (t) = integer_zero_node;
- }
+ }
else
finish_struct_1 (t, warn_anon);