aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/class.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a449b428..a57faa9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-05 Mark Mitchell <mark@codesourcery.com>
+
+ * class.c (end_of_class): Correct thinko.
+
2003-03-04 Nathanael Nerode <neroden@gcc.gnu.org>
* config-lang.in: Replace ${libstdcxx_version} by its value.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index a12fd73..433e426 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -4647,7 +4647,7 @@ end_of_class (tree t, int include_virtuals_p)
if (!include_virtuals_p
&& TREE_VIA_VIRTUAL (binfo)
- && !BINFO_PRIMARY_P (binfo))
+ && BINFO_PRIMARY_BASE_OF (binfo) != TYPE_BINFO (t))
continue;
offset = end_of_base (binfo);