From: Alexandre Petit-Bianco Date: Mon, 23 Oct 2000 19:52:45 +0000 (+0000) Subject: AbstractSet.java (equals): Re-installed original code. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eade41de2a29abec48be9a51d3a6d1186a5e3846;p=gcc.git AbstractSet.java (equals): Re-installed original code. 2000-10-23 Alexandre Petit-Bianco * java/util/AbstractSet.java (equals): Re-installed original code. (http://sources.redhat.com/ml/java-patches/2000-q4/msg00054.html) From-SVN: r37021 --- 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 + + * java/util/AbstractSet.java (equals): Re-installed original code. + 2000-10-22 Rolf W. Rasmussen * 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; }