diff options
| author | Mark Wielaard <mark@gcc.gnu.org> | 2002-02-14 23:16:11 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-02-14 23:16:11 +0000 |
| commit | 894286989e3b53d5c10f385763171672c1c0035c (patch) | |
| tree | 2b8e89cbcec8051aec3a4bab7d43c0c0d2c02ffe /libjava/java/util | |
| parent | 9a360704f9edf14fd0dd3a04dcf16923164c09b2 (diff) | |
| download | gcc-894286989e3b53d5c10f385763171672c1c0035c.zip gcc-894286989e3b53d5c10f385763171672c1c0035c.tar.gz gcc-894286989e3b53d5c10f385763171672c1c0035c.tar.bz2 | |
[multiple changes]
2002-02-14 Mark Wielaard <mark@klomp.org>
* java/math/BigInteger.java: import gnu.java.math.MPN not the whole
package as a workaround for gcj 3.0.x
2002-02-14 Mark Wielaard <mark@klomp.org>
* java/security/BasicPermission.java: extends with fully qualified
classname as workaround for gcj 3.0.4.
2002-02-14 Eric Blake <ebb9@email.byu.edu>
* java/net/DatagramSocketImpl.java (setOption, getOption): Work
around gcj bug of wrong emitted qualifier for inherited method.
* java/net/SocketImpl.java (setOption, getOption): Ditto.
* java/util/WeakHashMap.java (WeakEntrySet): Add non-private
constructor to reduce amount of emitted bytecode. While this
happens to work around a jikes 1.15 bug, it is still a useful
patch even for correct compilers.
* java/rmi/server/RMIClassLoader.java (MyClassLoader): Ditto.
* gnu/java/rmi/server/UnicastRemoteCall.java
(DummyObjectOutputStream, DummyObjectInputStream): Ditto.
2002-02-14 Eric Blake <ebb9@email.byu.edu>
* java/net/DatagramSocketImpl.java: Reformat (no code changes).
* java/net/SocketImpl.java: Ditto.
* java/rmi/server/RMIClassLoader.java: Ditto.
* gnu/java/rmi/server/UnicastRemoteCall.java: Ditto.
2002-02-14 Mark Wielaard <mark@klomp.org>
Thanks to Takashi Okamoto
* java/util/Arrays.java (ArrayList.indexOf()): this.equals().
* java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise.
* java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().
From-SVN: r49778
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/Arrays.java | 6 | ||||
| -rw-r--r-- | libjava/java/util/WeakHashMap.java | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/libjava/java/util/Arrays.java b/libjava/java/util/Arrays.java index 1285501..13f9be0 100644 --- a/libjava/java/util/Arrays.java +++ b/libjava/java/util/Arrays.java @@ -1,5 +1,5 @@ /* Arrays.java -- Utility class with methods to operate on arrays - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -2430,7 +2430,7 @@ public class Arrays { int size = a.length; for (int i = 0; i < size; i++) - if (equals(o, a[i])) + if (this.equals(o, a[i])) return i; return -1; } @@ -2439,7 +2439,7 @@ public class Arrays { int i = a.length; while (--i >= 0) - if (equals(o, a[i])) + if (this.equals(o, a[i])) return i; return -1; } diff --git a/libjava/java/util/WeakHashMap.java b/libjava/java/util/WeakHashMap.java index d86ec26..8c55ae0 100644 --- a/libjava/java/util/WeakHashMap.java +++ b/libjava/java/util/WeakHashMap.java @@ -1,6 +1,6 @@ /* java.util.WeakHashMap -- a hashtable that keeps only weak references to its keys, allowing the virtual machine to reclaim them - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -170,6 +170,13 @@ public class WeakHashMap extends AbstractMap implements Map private final class WeakEntrySet extends AbstractSet { /** + * Non-private constructor to reduce bytecode emitted. + */ + WeakEntrySet() + { + } + + /** * Returns the size of this set. * * @return the set size @@ -483,7 +490,7 @@ public class WeakHashMap extends AbstractMap implements Map */ WeakEntry getEntry() { - final Object key = get(); + final Object key = this.get(); if (key == null) return null; return new WeakEntry(key); |