summaryrefslogtreecommitdiff
path: root/libjava/java/text/natCollator.cc
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-30 09:31:00 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>1999-04-30 09:31:00 +0000
commitd41dfd6cc95692f13ca6dde18e9717679c00595d (patch)
tree4928c712cce75c2d0d4c9cf9f6f78ef4a4052149 /libjava/java/text/natCollator.cc
parent5f00c9ab3e46684aba3272ade7a944a34a82e991 (diff)
downloadgcc-d41dfd6cc95692f13ca6dde18e9717679c00595d.tar.gz
* java/lang/StringBuffer.java (ensureCapacity): Don't resize
vector when shared. * java/util/Locale.java (Locale(String,String)): Implement in terms of 3-argument version; variant now defaults to empty string. (toString): Assume variant is not null. (equals): Assume all strings are not null. (Locale): Throw NullPointerException if any argument is null. * java/util/ResourceBundle.java (getBundle): Don't try the base name; now implicit in partialGetBundle call. (trySomeGetBundle): Search for parent bundles and call setParent as required. (partialGetBundle): Added `langStop' argument. Use `Locale.toString' to compute bundleName. (resource_cache): New static field. (partialGetBundle): Cache the returned resource bundle. Now synchronized. * gnu/gcj/text/LocaleData_en.java (contents): [collatorRule] Added missing `<'. * mauve-libgcj: Enable Collator and RuleBasedCollator. * java/text/natCollator.cc (decomposeCharacter): `base' now `const'. * Makefile.in: Rebuilt. * Makefile.am (ordinary_java_source_files): Added CollationElementIterator, CollationKey, Collator, RuleBasedCollator. (nat_source_files): Added natCollator.cc. * java/text/RuleBasedCollator.java (ceiNext): No longer static. (compare): Pass `this' to CollationElementIterator constructor. (getCollationElementIterator): Likewise. (ceiNext): Fix off-by-one error when finding initial substring. (next): Correctly mask off bits when computing return value. Fixed return values when one string is shorter than the other. * java/text/CollationElementIterator.java (collator): New field. (CollationElementIterator): Added collator argument. (next): Call ceiNext on collator object. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26707 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text/natCollator.cc')
-rw-r--r--libjava/java/text/natCollator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/libjava/java/text/natCollator.cc b/libjava/java/text/natCollator.cc
index 7624b7c973a..378ac5c448c 100644
--- a/libjava/java/text/natCollator.cc
+++ b/libjava/java/text/natCollator.cc
@@ -30,7 +30,7 @@ java::text::Collator::decomposeCharacter (jchar c,
return;
}
- struct decomp_entry *base;
+ const struct decomp_entry *base;
int high;
if (decmp == FULL_DECOMPOSITION)