diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-18 17:27:43 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-18 17:27:43 +0000 |
| commit | 84994193d98adb513b0a62c25216a3468154f7c0 (patch) | |
| tree | 910cbd798ea02ac273cd0cb9fbfb22dd9896c753 | |
| parent | 3e1cab8e4882ecaf6e929ac8ffae6131301c7376 (diff) | |
| download | ppe42-gcc-84994193d98adb513b0a62c25216a3468154f7c0.tar.gz ppe42-gcc-84994193d98adb513b0a62c25216a3468154f7c0.zip | |
* java/text/CollationElementIterator.java (secondaryOrder): Cast
result to `short'.
(tertiaryOrder): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48162 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/text/CollationElementIterator.java | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 77f02e793bc..51a2404ab37 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-12-18 Tom Tromey <tromey@redhat.com> + + * java/text/CollationElementIterator.java (secondaryOrder): Cast + result to `short'. + (tertiaryOrder): Likewise. + 2001-12-16 Tom Tromey <tromey@redhat.com> For PR libgcj/5103: diff --git a/libjava/java/text/CollationElementIterator.java b/libjava/java/text/CollationElementIterator.java index 96732f7b2e3..f8d44746988 100644 --- a/libjava/java/text/CollationElementIterator.java +++ b/libjava/java/text/CollationElementIterator.java @@ -1,6 +1,6 @@ // CollationElementIterator.java - Iterate over decomposed characters. -/* Copyright (C) 1999 Free Software Foundation +/* Copyright (C) 1999, 2001 Free Software Foundation This file is part of libgcj. @@ -45,13 +45,13 @@ public final class CollationElementIterator public static final short secondaryOrder (int order) { // From the JDK 1.2 spec. - return (order >>> 8) & 255; + return (short) ((order >>> 8) & 255); } public static final short tertiaryOrder (int order) { // From the JDK 1.2 spec. - return order & 255; + return (short) (order & 255); } // Non-public constructor. |
