diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-03-20 10:14:50 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-03-20 10:14:50 -0700 |
| commit | 8a22bed790b6699fc5e52c7d796b556ef92ecb9c (patch) | |
| tree | 88e2b3a21551e58501a443536615473f5fe53350 | |
| parent | 27196ebc8d8d0cd8279755b6eca587f2f8ac6d4b (diff) | |
| download | libcore-8a22bed790b6699fc5e52c7d796b556ef92ecb9c.zip libcore-8a22bed790b6699fc5e52c7d796b556ef92ecb9c.tar.gz libcore-8a22bed790b6699fc5e52c7d796b556ef92ecb9c.tar.bz2 | |
libcore: Better Enum fix for JDK 7
* Jerome Pilliet suggests using a cast in the compareTo method instead of
changing the field visibility. This is a much better fix.
Change-Id: I334105e0922225512a4d0a2d4b6c9c6ec71b9c51
| -rw-r--r-- | luni/src/main/java/java/lang/Enum.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/luni/src/main/java/java/lang/Enum.java b/luni/src/main/java/java/lang/Enum.java index 7a20c86..1713561 100644 --- a/luni/src/main/java/java/lang/Enum.java +++ b/luni/src/main/java/java/lang/Enum.java @@ -51,7 +51,7 @@ public abstract class Enum<E extends Enum<E>> implements Serializable, Comparabl private final String name; - final int ordinal; + private final int ordinal; /** * Constructor for constants of enum subtypes. @@ -147,7 +147,7 @@ public abstract class Enum<E extends Enum<E>> implements Serializable, Comparabl * @see java.lang.Comparable */ public final int compareTo(E o) { - return ordinal - o.ordinal; + return ordinal - ((Enum<?>) o).ordinal; } /** |