diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-23 19:52:45 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-23 19:52:45 +0000 |
| commit | e5366fba707117e5dc27efeb91d724634802f3bb (patch) | |
| tree | 77cf6333816969eef7d02fb2f2c9ae0c31036f22 /libjava | |
| parent | 87b89821c43bfb3355bcfe25a67e1a2d351ecfa2 (diff) | |
| download | gcc-e5366fba707117e5dc27efeb91d724634802f3bb.tar.gz | |
2000-10-23 Alexandre Petit-Bianco <apbianco@cygnus.com>
* java/util/AbstractSet.java (equals): Re-installed original code.
(http://sources.redhat.com/ml/java-patches/2000-q4/msg00054.html)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37021 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/util/AbstractSet.java | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 785a36ee61b..120cf11f5e8 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2000-10-23 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * java/util/AbstractSet.java (equals): Re-installed original code. + 2000-10-22 Rolf W. Rasmussen <rolfwr@ii.uib.no> * Makefile.am: Added rules for libgcjx library. diff --git a/libjava/java/util/AbstractSet.java b/libjava/java/util/AbstractSet.java index b2dd30b7ffa..0c81e6ef757 100644 --- a/libjava/java/util/AbstractSet.java +++ b/libjava/java/util/AbstractSet.java @@ -52,10 +52,7 @@ public abstract class AbstractSet extends AbstractCollection implements Set { if (o == this) { return true; } else if (o instanceof Set && ((Set)o).size() == size()) { - throw new Error ("FIXME: compiler error - AbstractSet.equals"); - /* FIXME: this is the correct implementation, but a compiler - error prevents us from building it. - return containsAll((Collection)o); */ + return containsAll((Collection)o); } else { return false; } |