diff options
| author | Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> | 2004-11-18 05:37:13 +0000 |
|---|---|---|
| committer | Kriang Lerdsuwanakij <lerdsuwa@gcc.gnu.org> | 2004-11-18 05:37:13 +0000 |
| commit | 21a0c6e02e954af433961f306e18cbc96f31cab5 (patch) | |
| tree | c2de80f38c947fa654ee6ce1d35fb02b560f5c26 /libjava/java/lang/Object.h | |
| parent | 7915fbaa19b94cfe53f288d4d5d4f9350136a13e (diff) | |
| download | gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.zip gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.tar.gz gcc-21a0c6e02e954af433961f306e18cbc96f31cab5.tar.bz2 | |
Makefile.am: Correct friend function declaration.
* Makefile.am: Correct friend function declaration.
* Makefile.in: Regenerated.
* include/boehm-gc.h (JV_MARKOBJ_DECL, JV_MARKARRAY_DECL): Add
scope to function names. Declare functions directly.
* libjava/java/lang/Class.h
(java::lang::Class): Correct friend class declaration.
(_Jv_InitClass, _Jv_GetArrayClass): Move definition to global
scope.
* libjava/java/lang/Class.h
(java::lang::Object): Correct friend class declaration.
From-SVN: r90849
Diffstat (limited to 'libjava/java/lang/Object.h')
| -rw-r--r-- | libjava/java/lang/Object.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libjava/java/lang/Object.h b/libjava/java/lang/Object.h index 78ddbc4..0842e0b 100644 --- a/libjava/java/lang/Object.h +++ b/libjava/java/lang/Object.h @@ -1,6 +1,6 @@ // Object.h - Header file for java.lang.Object. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation This file is part of libgcj. @@ -28,6 +28,13 @@ protected: # endif }; +// Forward declarations for friends of java::lang::Object +void _Jv_MonitorEnter (jobject obj); +void _Jv_MonitorExit (jobject obj); +void _Jv_InitializeSyncMutex (void); +void _Jv_FinalizeObject (jobject obj); +bool _Jv_ObjectCheckMonitor (jobject obj); + class java::lang::Object : public _JvObjectPrefix { protected: @@ -45,11 +52,11 @@ public: void wait (void); void wait (jlong timeout); - friend void _Jv_MonitorEnter (jobject obj); - friend void _Jv_MonitorExit (jobject obj); - friend void _Jv_InitializeSyncMutex (void); - friend void _Jv_FinalizeObject (jobject obj); - friend bool _Jv_ObjectCheckMonitor (jobject obj); + friend void ::_Jv_MonitorEnter (jobject obj); + friend void ::_Jv_MonitorExit (jobject obj); + friend void ::_Jv_InitializeSyncMutex (void); + friend void ::_Jv_FinalizeObject (jobject obj); + friend bool ::_Jv_ObjectCheckMonitor (jobject obj); #ifdef JV_MARKOBJ_DECL friend JV_MARKOBJ_DECL; |