aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorNathan Sidwell <nathan@codesourcery.com>2000-03-18 10:28:02 +0000
committerNathan Sidwell <nathan@gcc.gnu.org>2000-03-18 10:28:02 +0000
commitf281dd5a9d89be2cf944d3f487090fb80bc1e875 (patch)
tree2c43f62a008324e64a3d718054e8d4f1a3f28d65 /gcc
parentca881de608067f6410be42e74c44aca9ad5e7c9e (diff)
downloadgcc-f281dd5a9d89be2cf944d3f487090fb80bc1e875.zip
gcc-f281dd5a9d89be2cf944d3f487090fb80bc1e875.tar.gz
gcc-f281dd5a9d89be2cf944d3f487090fb80bc1e875.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/class.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 45453b5..57d0d2f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-18 Nathan Sidwell <nathan@codesourcery.com>
+
+ * 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 <kenner@vlsi1.ultra.nyu.edu>
* class.c (build_vbase_path): Use integer_zerop.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 2540f27..83ece59 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);
}
}