From: Tom Tromey <tromey@redhat.com>
Date: Tue, 18 Dec 2001 17:27:43 +0000 (+0000)
Subject: CollationElementIterator.java (secondaryOrder): Cast result to `short'.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e964a852b2c97cd78bfd67806aff817d2439247b;p=gcc.git

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 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.