diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2001-10-16 08:35:17 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2001-10-16 09:35:17 +0100 |
| commit | 107abb2f61f6e53ebb7aa05b78fdd9234ee7877c (patch) | |
| tree | 48472b1f97ae998bfbcb469ac6838d504c367998 /libjava/jni.cc | |
| parent | 6fd617e3e1087374b10ae48d822bf23b9ba19e1b (diff) | |
| download | gcc-107abb2f61f6e53ebb7aa05b78fdd9234ee7877c.zip gcc-107abb2f61f6e53ebb7aa05b78fdd9234ee7877c.tar.gz gcc-107abb2f61f6e53ebb7aa05b78fdd9234ee7877c.tar.bz2 | |
Eliminate use of C++ static constructors.
* interpret.cc: Remove static Utf8Consts. Use namespace gcj.
* jni.cc: Likewise.
* resolve.cc: Likewise.
* defineclass.cc: Likewise.
(_Jv_ClassReader::handleClassBegin): Synchronize call to
_Jv_RegisterClass.
* include/jvm.h (void_signature, clinit_name, init_name, finit_name):
Declare in namespace gcj.
* java/lang/Class.h (Class): Remove initialization for primitive
types.
(friend void _Jv_InitPrimClass): This is in prims.cc.
* prims.cc (_Jv_InitPrimClass): Do primitive type initialization
here instead.
(void_signature, clinit_name, init_name, finit_name): Define in
namespace gcj.
(_Jv_CreateJavaVM): Call _Jv_InitThreads, _Jv_InitGC, and
_Jv_InitializeSyncMutex from here. Initialize Utf8 constants.
Initialize primitive types.
* java/lang/natClassLoader.cc (_Jv_RegisterClasses): Don't call
initialization routines. Don't synchronize.
* java/lang/natRuntime.cc (_load): Synchronize on java.lang.Class
across dlopen call.
From-SVN: r46282
Diffstat (limited to 'libjava/jni.cc')
| -rw-r--r-- | libjava/jni.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/jni.cc b/libjava/jni.cc index 8f4e4f1..8e586fa 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -48,6 +48,8 @@ details. */ #include <java-interp.h> #include <java-threads.h> +using namespace gcj; + // This enum is used to select different template instantiations in // the invocation code. enum invocation_type @@ -1502,9 +1504,6 @@ _Jv_JNI_ToReflectedMethod (JNIEnv *env, jclass klass, jmethodID id, { using namespace java::lang::reflect; - // FIXME. - static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6); - jobject result = NULL; try |