diff options
| author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-06-28 13:29:13 +0000 |
| commit | 1020ce5944edde4364baef4d371cd4f9b0dae721 (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/java/text | |
| parent | 9f41ce98ce6f4f7c8ac5e2c4b6e5d27e10201015 (diff) | |
| download | gcc-1020ce5944edde4364baef4d371cd4f9b0dae721.tar.gz | |
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/text')
| -rw-r--r-- | libjava/java/text/CollationElementIterator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/java/text/CollationElementIterator.h b/libjava/java/text/CollationElementIterator.h index 19d92b8cab6..a3b75de189e 100644 --- a/libjava/java/text/CollationElementIterator.h +++ b/libjava/java/text/CollationElementIterator.h @@ -28,6 +28,7 @@ class java::text::CollationElementIterator : public ::java::lang::Object public: // actually package-private CollationElementIterator(::java::text::RuleBasedCollator *, ::java::lang::String *); + CollationElementIterator(::java::text::RuleBasedCollator *, ::java::text::CharacterIterator *); ::java::text::RuleBasedCollator$CollationElement * nextBlock(); ::java::text::RuleBasedCollator$CollationElement * previousBlock(); public: @@ -45,7 +46,7 @@ public: static const jint NULLORDER = -1; public: // actually package-private ::java::text::RuleBasedCollator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator; - ::java::lang::String * text; + ::java::text::CharacterIterator * text; jint index; jint textIndex; private: |