diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2006-02-08 20:38:13 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2006-02-08 20:38:13 +0000 |
| commit | 2cf94e58cbde0c5e906720768bd738588a1a075a (patch) | |
| tree | cf833007c737395cb44ea9f031474173d9ab680a /libjava/gcj/javaprims.h | |
| parent | 8b1753e3ec0f38a18b8bcd3c13e2b6b55f799099 (diff) | |
| download | gcc-2cf94e58cbde0c5e906720768bd738588a1a075a.zip gcc-2cf94e58cbde0c5e906720768bd738588a1a075a.tar.gz gcc-2cf94e58cbde0c5e906720768bd738588a1a075a.tar.bz2 | |
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
Diffstat (limited to 'libjava/gcj/javaprims.h')
| -rw-r--r-- | libjava/gcj/javaprims.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index f8c2ed6..a9dd845 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -489,7 +489,7 @@ extern "C" jstring _Jv_NewStringLatin1(const char*, jsize) __attribute__((__malloc__)); extern "C" jsize _Jv_GetStringUTFLength (jstring); extern "C" jsize _Jv_GetStringUTFRegion (jstring, jsize, jsize, char *); -extern "C" jint _Jv_hashUtf8String (char*, int); +extern "C" jint _Jv_hashUtf8String (const char*, int); struct _Jv_VMOption { @@ -561,17 +561,17 @@ class _Jv_Utf8Const jstring toString() { return _Jv_NewStringUTF(data); } /** Given an UTF8 string, how many bytes needed for a UTF8Const, including struct header, and final NUL. I.e. what to pas to malloc. */ - static int space_needed (char *, int len) + static int space_needed (const char *, int len) { return sizeof (_Jv_Utf8Const) + len + 1; } /** Given an allocated _Jv_Utf8Const, copy / fill it in. */ - void init (char *s, int len); + void init (const char *s, int len); friend jboolean _Jv_equalUtf8Consts (const _Jv_Utf8Const*, const _Jv_Utf8Const *); friend jboolean _Jv_equal (_Jv_Utf8Const*, jstring, jint); friend jboolean _Jv_equaln (_Jv_Utf8Const*, jstring, jint); friend jboolean _Jv_equalUtf8Classnames (const _Jv_Utf8Const*, const _Jv_Utf8Const*); friend jboolean _Jv_isPrimitiveOrDerived (const _Jv_Utf8Const*); - friend _Jv_Utf8Const *_Jv_makeUtf8Const (char*, int); + friend _Jv_Utf8Const *_Jv_makeUtf8Const (const char*, int); friend _Jv_Utf8Const *_Jv_makeUtf8Const (jstring); friend jstring _Jv_NewStringUtf8Const (_Jv_Utf8Const*); }; |