diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-23 21:33:01 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-23 21:33:01 +0000 |
| commit | 8813304d12d261bcb757d96a68b80d77d31fb989 (patch) | |
| tree | e898b30da970843f536fa79a78ba71f8ce583e64 /libjava/java/lang | |
| parent | 68c70ef82e60b0bb976fdc87315cb953382f4ed8 (diff) | |
| download | ppe42-gcc-8813304d12d261bcb757d96a68b80d77d31fb989.tar.gz ppe42-gcc-8813304d12d261bcb757d96a68b80d77d31fb989.zip | |
2004-11-23 Michael Koch <konqueror@gmx.de>
* java/lang/String.java (rehash): Removed.
* java/lang/natString.cc (rehash): Made static.
(_Jv_NewStringUtf8Const): Use static rehash method.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91104 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/String.java | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natString.cc | 9 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index 6c5f9490f77..e8bb1bba1d9 100644 --- a/libjava/java/lang/String.java +++ b/libjava/java/lang/String.java @@ -1,5 +1,5 @@ /* String.java -- immutable character sequences; the object of string literals - Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -1254,5 +1254,4 @@ public final class String implements Serializable, Comparable, CharSequence private native void init(byte[] chars, int offset, int count, String enc) throws UnsupportedEncodingException; private native void init(gnu.gcj.runtime.StringBuffer buffer); - private static native void rehash(); } diff --git a/libjava/java/lang/natString.cc b/libjava/java/lang/natString.cc index e01f467b79f..cba0976bd95 100644 --- a/libjava/java/lang/natString.cc +++ b/libjava/java/lang/natString.cc @@ -1,6 +1,7 @@ // natString.cc - Implementation of java.lang.String native methods. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation This file is part of libgcj. @@ -116,8 +117,8 @@ _Jv_StringGetSlot (jstring str) return _Jv_StringFindSlot(data, length, hashChars (data, length)); } -void -java::lang::String::rehash() +static void +rehash () { JvSynchronize sync (&StringClass); @@ -287,7 +288,7 @@ _Jv_NewStringUtf8Const (Utf8Const* str) JvSynchronize sync (&StringClass); if (3 * strhash_count >= 2 * strhash_size) - java::lang::String::rehash(); + rehash (); jstring* ptr = _Jv_StringFindSlot (chrs, length, hash); if (*ptr != NULL && *ptr != DELETED_STRING) return (jstring) UNMASK_PTR (*ptr); |
