From f281dd5a9d89be2cf944d3f487090fb80bc1e875 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Sat, 18 Mar 2000 10:28:02 +0000 Subject: [PATCH] class.c (build_base_field): Use TYPE_ALIGN to examine a type. * class.c (build_base_field): Use TYPE_ALIGN to examine a type. (note_name_declared_in_class): Use OVL_CURRENT to get at a potential overload. From-SVN: r32617 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 45453b52e48..57d0d2fc476 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2000-03-18 Nathan Sidwell + + * class.c (build_base_field): Use TYPE_ALIGN to examine a type. + (note_name_declared_in_class): Use OVL_CURRENT to get at a + potential overload. + Fri Mar 17 08:09:14 2000 Richard Kenner * class.c (build_vbase_path): Use integer_zerop. diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 2540f274869..83ece59018b 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4292,7 +4292,7 @@ build_base_field (rli, binfo, empty_p, base_align, v) /* This code assumes that zero-sized classes have one-byte alignment. There might someday be a system where that's not true. */ - my_friendly_assert (DECL_ALIGN (basetype) == BITS_PER_UNIT, + my_friendly_assert (TYPE_ALIGN (basetype) == BITS_PER_UNIT, 20000314); /* This is an empty base class. We first try to put it at @@ -6519,7 +6519,7 @@ note_name_declared_in_class (name, decl) S. */ cp_error ("declaration of `%#D'", decl); cp_error_at ("changes meaning of `%s' from `%+#D'", - IDENTIFIER_POINTER (DECL_NAME (decl)), + IDENTIFIER_POINTER (DECL_NAME (OVL_CURRENT (decl))), (tree) n->value); } }