* libjava/java/lang/Class.h

	(java::lang::Class): Correct friend class declaration.

From-SVN: r89578

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 51ee45bb6375bd24e16d67c7ca38ab6f699e54aa..7bd455422373b2f242dcbb3f6be6cd5729c24648 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-26  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
+
+       * libjava/java/lang/Class.h
+       (java::lang::Class): Correct friend class declaration.
+
 2004-10-25  Geoffrey Keating  <geoffk@apple.com>
 
        * Makefile.am (DARWIN_CRT_SRC): New.

diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index 02a97dfcf14e975392974ae8e81622adad2083ed..c8f24c77bae473fa4c89cfa3ae3ac5e13d4646c2 100644 (file)
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -143,6 +143,13 @@ struct _Jv_CatchClass
 
 #define JV_CLASS(Obj) ((jclass) (*(_Jv_VTable **) Obj)->clas)
 
+// Forward declarations for friends of java::lang::Class
+class _Jv_ClassReader; 
+class _Jv_InterpClass;
+class _Jv_InterpMethod;
+class _Jv_BytecodeVerifier;
+class _Jv_StackTrace;
+
 class java::lang::Class : public java::lang::Object
 {
 public:
@@ -379,17 +386,17 @@ private:
 
   friend void _Jv_Defer_Resolution (void *cl, _Jv_Method *meth, void **);
   
-  friend class _Jv_ClassReader;        
-  friend class _Jv_InterpClass;
-  friend class _Jv_InterpMethod;
+  friend class ::_Jv_ClassReader;      
+  friend class ::_Jv_InterpClass;
+  friend class ::_Jv_InterpMethod;
 #endif
 
 #ifdef JV_MARKOBJ_DECL
   friend JV_MARKOBJ_DECL;
 #endif
 
-  friend class _Jv_BytecodeVerifier;
-  friend class _Jv_StackTrace;
+  friend class ::_Jv_BytecodeVerifier;
+  friend class ::_Jv_StackTrace;
   friend class gnu::gcj::runtime::StackTrace;
   friend class java::io::VMObjectStreamClass;