From 6e5bd8b06ad4c1bb84cb0ec404a02197b5f9a2fe Mon Sep 17 00:00:00 2001 From: mmitchel Date: Thu, 17 Oct 2002 22:35:49 +0000 Subject: PR c++/7584 * class.c (handle_using_decl): Allow the declaration used to be from an ambiguous base. PR c++/7584 * g++.dg/inherit/using3.C: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58262 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/class.c | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f0b230a962..b6836eef407 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2002-10-17 Mark Mitchell + PR c++/7584 + * class.c (handle_using_decl): Allow the declaration used to be + from an ambiguous base. + * pt.c (convert_template_argument): Revert this change: 2002-10-16 Mark Mitchell * pt.c (convert_template_argument): Do not fold non-type diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 59f5ce37fc1..90d7ef2c921 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -1155,9 +1155,12 @@ handle_using_decl (using_decl, t) tree flist = NULL_TREE; tree old_value; - binfo = binfo_or_else (ctype, t); + binfo = lookup_base (t, ctype, ba_any, NULL); if (! binfo) - return; + { + error_not_base_type (t, ctype); + return; + } if (constructor_name_p (name, ctype)) { -- cgit v1.2.1