CollationElementIterator.java (secondaryOrder): Cast result to `short'.

	* java/text/CollationElementIterator.java (secondaryOrder): Cast
	result to `short'.
	(tertiaryOrder): Likewise.

From-SVN: r48162

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 77f02e793bc53e773f38c8deff5ead966c199ffe..51a2404ab37029a315db16ec3f19c609f817a2fa 100644 (file)
--- 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 96732f7b2e339e8afd48c90f636f9b9d02b2e881..f8d44746988661bdc4fd7b9f02523d0354dcc484 100644 (file)
--- 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.