From 3e355d92c28f77afdad6d79472cac3afcfabb93b Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Mon, 23 Jan 2006 18:20:17 +0000 Subject: [PATCH] cp-tree.h (get_vtt_name): Remove prototype. * cp-tree.h (get_vtt_name): Remove prototype. * class.c (get_vtt_name): Remove. (build_vtt): Call mangle_vtt_for_type instead of get_vtt_name. From-SVN: r110136 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 11 +---------- gcc/cp/cp-tree.h | 1 - 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index be2c231d7782..f219c42f6550 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2006-01-23 Volker Reichelt + + * cp-tree.h (get_vtt_name): Remove prototype. + * class.c (get_vtt_name): Remove. + (build_vtt): Call mangle_vtt_for_type instead of get_vtt_name. + 2006-01-22 Gabriel Dos Reis * rtti.c (build_dynamic_cast): Fix comment. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 6b075cbd0b72..ecad65054f98 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -640,15 +640,6 @@ get_vtable_name (tree type) return mangle_vtbl_for_type (type); } -/* Return an IDENTIFIER_NODE for the name of the virtual table table - for TYPE. */ - -tree -get_vtt_name (tree type) -{ - return mangle_vtt_for_type (type); -} - /* DECL is an entity associated with TYPE, like a virtual table or an implicitly generated constructor. Determine whether or not DECL should have external or internal linkage at the object file @@ -6725,7 +6716,7 @@ build_vtt (tree t) type = build_cplus_array_type (const_ptr_type_node, type); /* Now, build the VTT object itself. */ - vtt = build_vtable (t, get_vtt_name (t), type); + vtt = build_vtable (t, mangle_vtt_for_type (t), type); initialize_artificial_var (vtt, inits); /* Add the VTT to the vtables list. */ TREE_CHAIN (vtt) = TREE_CHAIN (CLASSTYPE_VTABLES (t)); diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1c66e11aedc7..c65309c1da98 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3740,7 +3740,6 @@ extern void invalidate_class_lookup_cache (void); extern void maybe_note_name_used_in_class (tree, tree); extern void note_name_declared_in_class (tree, tree); extern tree get_vtbl_decl_for_binfo (tree); -extern tree get_vtt_name (tree); extern tree get_primary_binfo (tree); extern void debug_class (tree); extern void debug_thunks (tree);