diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-01-04 17:59:40 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-01-04 17:59:40 +0000 |
| commit | 2fb13888768c8d03adf4821b6e87e9ec737bbf81 (patch) | |
| tree | e521b0eaad4a6095d031024a451e9d1b0154518b /libjava/java | |
| parent | a8c253d02021dd360a0af547f52f47218702b185 (diff) | |
| download | gcc-2fb13888768c8d03adf4821b6e87e9ec737bbf81.zip gcc-2fb13888768c8d03adf4821b6e87e9ec737bbf81.tar.gz gcc-2fb13888768c8d03adf4821b6e87e9ec737bbf81.tar.bz2 | |
Class.h (_Jv_CopyClassesToSystemLoader): Updated.
* java/lang/Class.h (_Jv_CopyClassesToSystemLoader): Updated.
* java/lang/natClassLoader.cc (_Jv_CopyClassesToSystemLoader):
Changed argument type. Use SystemClassLoader.addClass.
* gnu/gcj/runtime/SystemClassLoader.java (addClass): New method.
From-SVN: r109340
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 21 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 7 |
2 files changed, 22 insertions, 6 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index a2ec357..1c14df3 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -1,6 +1,6 @@ // Class.h - Header file for java.lang.Class. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -22,6 +22,21 @@ details. */ #include <java/security/ProtectionDomain.h> #include <java/lang/Package.h> +// Avoid including SystemClassLoader.h. +extern "Java" +{ + namespace gnu + { + namespace gcj + { + namespace runtime + { + class SystemClassLoader; + } + } + } +} + // We declare these here to avoid including gcj/cni.h. extern "C" void _Jv_InitClass (jclass klass); extern "C" void _Jv_RegisterClasses (const jclass *classes); @@ -237,7 +252,7 @@ jclass _Jv_GetArrayClass (jclass klass, java::lang::ClassLoader *loader); jboolean _Jv_IsInterpretedClass (jclass); jboolean _Jv_IsBinaryCompatibilityABI (jclass); -void _Jv_CopyClassesToSystemLoader (java::lang::ClassLoader *); +void _Jv_CopyClassesToSystemLoader (gnu::gcj::runtime::SystemClassLoader *); #ifdef INTERPRETER void _Jv_InitField (jobject, jclass, int); @@ -498,7 +513,7 @@ private: friend void *::_Jv_ResolvePoolEntry (jclass this_class, jint index); - friend void ::_Jv_CopyClassesToSystemLoader (java::lang::ClassLoader *); + friend void ::_Jv_CopyClassesToSystemLoader (gnu::gcj::runtime::SystemClassLoader *); // Chain for class pool. This also doubles as the ABI version // number. It is only used for this purpose at class registration diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index cfb0612..797005b 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -1,6 +1,6 @@ // natClassLoader.cc - Implementation of java.lang.ClassLoader native methods. -/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation This file is part of libgcj. @@ -43,6 +43,7 @@ details. */ #include <java/lang/Cloneable.h> #include <java/util/HashMap.h> #include <gnu/gcj/runtime/BootClassLoader.h> +#include <gnu/gcj/runtime/SystemClassLoader.h> // Size of local hash table. #define HASH_LEN 1013 @@ -253,14 +254,14 @@ _Jv_RegisterClass (jclass klass) // This is used during initialization to register all compiled-in // classes that are not part of the core with the system class loader. void -_Jv_CopyClassesToSystemLoader (java::lang::ClassLoader *loader) +_Jv_CopyClassesToSystemLoader (gnu::gcj::runtime::SystemClassLoader *loader) { for (jclass klass = system_class_list; klass; klass = klass->next_or_version) { klass->loader = loader; - loader->loadedClasses->put(klass->name->toString(), klass); + loader->addClass(klass); } system_class_list = SYSTEM_LOADER_INITIALIZED; } |