diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-12-18 17:27:43 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-12-18 17:27:43 +0000 |
| commit | e964a852b2c97cd78bfd67806aff817d2439247b (patch) | |
| tree | 910cbd798ea02ac273cd0cb9fbfb22dd9896c753 /libjava | |
| parent | 8c5bc4d56e169e0cbf377bc73b2cc0654db4f3fe (diff) | |
| download | gcc-e964a852b2c97cd78bfd67806aff817d2439247b.zip gcc-e964a852b2c97cd78bfd67806aff817d2439247b.tar.gz gcc-e964a852b2c97cd78bfd67806aff817d2439247b.tar.bz2 | |
CollationElementIterator.java (secondaryOrder): Cast result to `short'.
* java/text/CollationElementIterator.java (secondaryOrder): Cast
result to `short'.
(tertiaryOrder): Likewise.
From-SVN: r48162
Diffstat (limited to 'libjava')
| -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 77f02e7..51a2404 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 96732f7..f8d4474 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. |