diff options
author | Mark Wielaard <mark@klomp.org> | 2007-03-05 17:27:44 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-03-05 17:27:44 +0000 |
commit | 666ff4f65d256dec0974941605cf76db0b138a76 (patch) | |
tree | 7094a7844e13e49f92832894c3b7a7f8ff638d8b /libjava/java/lang/Character$UnicodeBlock.h | |
parent | b48a45922ddcdfd0aa2cd3ff24c7c158d20c1f2e (diff) | |
download | gcc-666ff4f65d256dec0974941605cf76db0b138a76.zip gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.gz gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.bz2 |
Character.java: Re-merged with Classpath.
2007-03-05 Mark Wielaard <mark@klomp.org>
* java/lang/Character.java: Re-merged with Classpath.
* java/lang/natString.cc (nativeCompareTo): Renamed from
compareTo.
* java/lang/StringBuilder.java: Re-merged with Classpath.
* java/lang/String.java: Re-merged with Classpath.
(nativeCompareTo): Renamed from compareTo.
* java/lang/StringBuffer.java: Re-merged with Classpath.
* jni.cc (_Jv_JNI_GetAnyMethodID): Split calls to append.
From-SVN: r122560
Diffstat (limited to 'libjava/java/lang/Character$UnicodeBlock.h')
-rw-r--r-- | libjava/java/lang/Character$UnicodeBlock.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/lang/Character$UnicodeBlock.h b/libjava/java/lang/Character$UnicodeBlock.h index 43fa6b4..b32f212 100644 --- a/libjava/java/lang/Character$UnicodeBlock.h +++ b/libjava/java/lang/Character$UnicodeBlock.h @@ -18,13 +18,12 @@ public: static ::java::lang::Character$UnicodeBlock * of(jchar); static ::java::lang::Character$UnicodeBlock * of(jint); static ::java::lang::Character$UnicodeBlock * forName(::java::lang::String *); +public: // actually package-private + static JArray< jint > * $SWITCH_TABLE$java$lang$Character$UnicodeBlock$NameType(); private: jint __attribute__((aligned(__alignof__( ::java::lang::Character$Subset)))) start; jint end; ::java::lang::String * canonicalName; - static const jint CANONICAL_NAME = 0; - static const jint NO_SPACES_NAME = 1; - static const jint CONSTANT_NAME = 2; public: static ::java::lang::Character$UnicodeBlock * BASIC_LATIN; static ::java::lang::Character$UnicodeBlock * LATIN_1_SUPPLEMENT; @@ -154,6 +153,7 @@ public: static ::java::lang::Character$UnicodeBlock * SURROGATES_AREA; private: static JArray< ::java::lang::Character$UnicodeBlock * > * sets; + static JArray< jint > * $SWITCH_TABLE$java$lang$Character$UnicodeBlock$NameType__; public: static ::java::lang::Class class$; }; |