diff options
| author | Martin v. Löwis <loewis@informatik.hu-berlin.de> | 1998-09-21 13:34:10 +0000 |
|---|---|---|
| committer | Martin v. Löwis <loewis@gcc.gnu.org> | 1998-09-21 13:34:10 +0000 |
| commit | 0cfdd854df16a8bb6f36d9b5ed998a802038a223 (patch) | |
| tree | 91793ddf58020ecf24747767f5100d7f333e5f7f | |
| parent | 5225130d3947153492247f344964f33b4128f50a (diff) | |
| download | gcc-0cfdd854df16a8bb6f36d9b5ed998a802038a223.zip gcc-0cfdd854df16a8bb6f36d9b5ed998a802038a223.tar.gz gcc-0cfdd854df16a8bb6f36d9b5ed998a802038a223.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/method.c | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 40293b8..6ccd3bf 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 0b7260c..2702ac5 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) |