yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile.am: Correct friend function declaration.

Browse Source 
* 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
This commit is contained in:
Kriang Lerdsuwanakij
2004-11-18 05:37:13 +00:00
committed by Kriang Lerdsuwanakij
parent 7915fbaa19
commit 21a0c6e02e
6 changed files with 311 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/lang/Object.h
+13 -6
View File
@@ -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;