1998-09-20 Martin von L�wis <loewis@informatik.hu-berlin.de>

	* method.c (hack_identifier): Finding multiple members is always
	an error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22528 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 40293b8..6ccd3bf 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+1998-09-20  Martin von Löwis  <loewis@informatik.hu-berlin.de>
+
+       * method.c (hack_identifier): Finding multiple members is always
+       an error.
+
 1998-09-21  Per Bothner  <bothner@cygnus.com>
 
        * Make-lang.in (c++-filt):  Link libiberty.a after cxxmain.o.

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 0b7260c..2702ac5 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -1944,14 +1944,9 @@ hack_identifier (value, name)
     }
   else if (TREE_CODE (value) == TREE_LIST && TREE_NONLOCAL_FLAG (value))
     {
-      if (type == 0)
-       {
-         error ("request for member `%s' is ambiguous in multiple inheritance lattice",
-                IDENTIFIER_POINTER (name));
-         return error_mark_node;
-       }
-
-      return value;
+      error ("request for member `%s' is ambiguous in multiple inheritance lattice",
+            IDENTIFIER_POINTER (name));
+      return error_mark_node;
     }
 
   if (! processing_template_decl)