From 8234c6c11a17ea58b80719e228bf6904351f34f6 Mon Sep 17 00:00:00 2001
From: Mark Mitchell <mark@codesourcery.com>
Date: Wed, 5 Mar 2003 08:27:42 +0000
Subject: [PATCH] * class.c (end_of_class): Correct thinko.

From-SVN: r63829
---
 gcc/cp/ChangeLog | 4 ++++
 gcc/cp/class.c   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a449b428d43..a57faa906c4 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 a12fd73ae17..433e4266cba 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);
-- 
2.30.2