From: Martin v. Löwis <loewis@informatik.hu-berlin.de>
Date: Mon, 21 Sep 1998 13:34:10 +0000 (+0000)
Subject: method.c (hack_identifier): Finding multiple members is always an error.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0cfdd854df16a8bb6f36d9b5ed998a802038a223;p=gcc.git

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

1998-09-20  Martin von L�wis  <loewis@informatik.hu-berlin.de>
	* method.c (hack_identifier): Finding multiple members is always
	an error.

From-SVN: r22528
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 40293b886bd..6ccd3bf7127 100644
--- 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 0b7260cf490..2702ac59771 100644
--- 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)