diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-12-29 06:39:42 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-12-29 06:39:42 +0000 |
| commit | a98fd0a10be1620e1e2d5bd72f636f6b2ba04ade (patch) | |
| tree | 02af3c9fb37ba315f28a7d7bf244be358e737985 /gcc/cp/call.c | |
| parent | 6ed1e0f83fc1ccfc1be3967c04018918ea64440a (diff) | |
| download | ppe42-gcc-a98fd0a10be1620e1e2d5bd72f636f6b2ba04ade.tar.gz ppe42-gcc-a98fd0a10be1620e1e2d5bd72f636f6b2ba04ade.zip | |
* cp-tree.h (lang_type): Replace abstract_virtuals with pure_virtuals.
(CLASSTYPE_ABSTRACT_VIRTUALS): Rename to ...
(CLASSTYPE_PURE_VIRTUALS): ... this.
(lang_decl_flags): Replace abstract_virtual with pure_virtual.
(DECL_ABSTRACT_VIRTUAL_P): Rename to ...
(DECL_PURE_VIRTUAL_P): ... this.
(get_abstract_virtuals): Rename to ...
(get_pure_virtuals): ... this.
* call.c (build_new_method_call): Replace DECL_PURE_VIRTUAL_P with
DECL_ABSTRACT_VIRTUAL_P. Replace CLASSTYPE_ABSTRACT_VIRTUALS with
CLASSTYPE_PURE_VIRTUALS.
* class.c (build_vtable_entry): Likewise.
(finish_struct_bits): Likewise. Call get_pure_virtuals, not
get_abstract_virtuals.
(build_vtbl_initializer): Likewise.
(override_one_vtable): Likewise.
(check_methods): Likewise.
* decl.c (duplicate_decls): Likewise.
(redeclaration_error_message): Likewise.
(lang_mark_tree): Likewise.
* decl2.c (grok_function_init): Likewise.
(import_export_vtable): Likewise.
(import_expor_class): Likewise.
* typeck2.c (abstract_virtuals_error): Likewise.
* xref.c (GNU_xref_member): Likewise.
* search.c (get_abstract_virtuals): Rename to get_pure_virtuals.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@31114 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index cfc6fd5c745..fd5cfeecb35 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4319,11 +4319,11 @@ build_new_method_call (instance, name, args, basetype_path, flags) return error_mark_node; } - if (DECL_ABSTRACT_VIRTUAL_P (cand->fn) + if (DECL_PURE_VIRTUAL_P (cand->fn) && instance == current_class_ref && DECL_CONSTRUCTOR_P (current_function_decl) && ! (flags & LOOKUP_NONVIRTUAL) - && value_member (cand->fn, CLASSTYPE_ABSTRACT_VIRTUALS (basetype))) + && value_member (cand->fn, CLASSTYPE_PURE_VIRTUALS (basetype))) cp_error ("abstract virtual `%#D' called from constructor", cand->fn); if (TREE_CODE (TREE_TYPE (cand->fn)) == METHOD_TYPE && is_dummy_object (instance_ptr)) |
