diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2004-09-21 15:39:00 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@codesourcery.com> | 2004-09-21 15:39:00 +0000 |
| commit | 398f853089d0922d365d27e5c540254a2904f09c (patch) | |
| tree | dedf44db33acea43bf8c4d28b28397caa6180946 /gcc/cp/init.c | |
| parent | 464bb81dac8d165abf5aa9d9b813be2b2dff3a2b (diff) | |
* cp-tree.h (struct lang_type_header): Remove
uses_multiple_inheritance field.
(TYPE_USES_MULTIPLE_INHERITANCE): Remove.
(TYPE_BASE_CONVS_MAY_REQUIRE_CODE_P): Remove.
(TYPE_USES_VIRTUAL_BASECLASSES): Remove.
(DECL_NEEDS_VTT_PARM_P): Use CLASSTYPE_VBASECLASSES.
(TYPE_CONTAINS_VPTR_P): Likewise.
* call.c (add_template_candidate_real): Use
CLASSTYPE_VBASECLASSES.
(build_special_member_call): Likewise.
* class.c (finish_struct_bits): Remove
TYPE_BASE_CONVS_MAY_REQUIRE_CODE_P & TYPE_USES_VIRTUAL_BASECLASSES
bookkeeping.
(check_bases_and_members): Use TYPE_CONTAINS_VPTR_P.
(create_vtable_ptr): Remove TYPE_BASE_CONVS_MAY_REQUIRE_CODE_P
bookkeeping.
(build_vtt_inits): Use CLASSTYPE_VBASECLASSES.
(accumulate_vtbl_inits, build_vbase_offset_vtbl_entries):
Likewise.
* decl.c (xref_basetypes): Remove TYPE_USES_MULTIPLE_INHERITANCE,
TYPE_BASE_CONVS_MAY_REQUIRE_CODE_P, TYPE_USES_VIRTUAL_BASECLASSES
bookkeeping.
(cxx_maybe_build_cleanup): Use CLASSTYPE_VBASECLASSES.
* decl2.c (maybe_retrofit_in_chrg): Likewise.
* init.c (expand_member, push_base_cleanups): Likewise.
* pt.c (instantiate_class_template): Remove
TYPE_USES_MULTIPLE_INHERITANCE,
TYPE_BASE_CONVS_MAY_REQUIRE_CODE_P, TYPE_USES_VIRTUAL_BASECLASSES
bookkeeping.
* ptree.c (cxx_print_type): Remove TYPE_USES_MULTIPLE_INHERITANCE
check.
* typeck2.c (process_init_constructor): Replace some sorrys with
asserts.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@87808 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 01478818b27..58dac9685a7 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1001,7 +1001,7 @@ expand_member_init (tree name) if (!direct_binfo && !virtual_binfo) { - if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type)) + if (CLASSTYPE_VBASECLASSES (current_class_type)) error ("type `%D' is not a direct or virtual base of `%T'", name, current_class_type); else @@ -2855,7 +2855,7 @@ push_base_cleanups (void) VEC (tree) *vbases; /* Run destructors for all virtual baseclasses. */ - if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type)) + if (CLASSTYPE_VBASECLASSES (current_class_type)) { tree cond = (condition_conversion (build2 (BIT_AND_EXPR, integer_type_node, |