From cb634ce97bd62e237f21e6ff2955e62820cdc326 Mon Sep 17 00:00:00 2001 From: tromey Date: Fri, 26 Nov 2004 02:27:54 +0000 Subject: * gnu/gcj/util/natDebug.cc (getField): Don't qualify name. * java/lang/Class.h (_Jv_Linker): Declare. (Class): Fix names of friends. (_Jv_getInterfaceMethod): Declare. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91320 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/Class.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'libjava/java/lang') diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 320b09965d0..f38f16f680e 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -61,6 +61,7 @@ struct _Jv_Field; struct _Jv_VTable; union _Jv_word; struct _Jv_ArrayVTable; +class _Jv_Linker; class _Jv_ExecutionEngine; class _Jv_CompiledEngine; class _Jv_InterpreterEngine; @@ -186,6 +187,10 @@ void *_Jv_AllocObj (jint, jclass); void *_Jv_AllocPtrFreeObj (jint, jclass); void *_Jv_AllocArray (jint, jclass); +bool _Jv_getInterfaceMethod(jclass, jclass&, int&, + const _Jv_Utf8Const*, + const _Jv_Utf8Const*); + jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID, jboolean); jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, @@ -454,9 +459,9 @@ private: friend jboolean (::_Jv_CheckAccess) (jclass self_klass, jclass other_klass, jint flags); - friend bool _Jv_getInterfaceMethod(jclass, jclass&, int&, - const _Jv_Utf8Const*, - const _Jv_Utf8Const*); + friend bool (::_Jv_getInterfaceMethod) (jclass, jclass&, int&, + const _Jv_Utf8Const*, + const _Jv_Utf8Const*); friend jclass (::_Jv_GetArrayClass) (jclass klass, java::lang::ClassLoader *loader); @@ -478,10 +483,10 @@ private: friend class gnu::gcj::runtime::StackTrace; friend class java::io::VMObjectStreamClass; - friend class _Jv_Linker; - friend class _Jv_ExecutionEngine; - friend class _Jv_CompiledEngine; - friend class _Jv_InterpreterEngine; + friend class ::_Jv_Linker; + friend class ::_Jv_ExecutionEngine; + friend class ::_Jv_CompiledEngine; + friend class ::_Jv_InterpreterEngine; friend void ::_Jv_sharedlib_register_hook (jclass klass); -- cgit v1.2.3