From 1052cd6573a2b1c5dc981d2b61f2dd61c080d869 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 26 Sep 1997 15:42:46 +0000 Subject: [PATCH] search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns. * search.c (get_matching_virtual): Notice virtual bases when sorrying about covariant returns. From-SVN: r15732 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/search.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e83908ae61e..b4e0fc921ad 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ Fri Sep 26 00:22:56 1997 Jason Merrill + * search.c (get_matching_virtual): Notice virtual bases when sorrying + about covariant returns. + * parse.y (member_init): Also imply typename here. Remove ancient extension for initializing base members. diff --git a/gcc/cp/search.c b/gcc/cp/search.c index c8e08064630..6da3f81713a 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -2197,7 +2197,8 @@ get_matching_virtual (binfo, fndecl, dtorp) { tree binfo = get_binfo (b, d, 1); if (binfo != error_mark_node - && ! BINFO_OFFSET_ZEROP (binfo)) + && (! BINFO_OFFSET_ZEROP (binfo) + || TREE_VIA_VIRTUAL (binfo))) sorry ("adjusting pointers for covariant returns"); } if (TYPE_READONLY (d) > TYPE_READONLY (b)) -- 2.30.2