aboutsummaryrefslogtreecommitdiff
path: root/libjava/resolve.cc
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2003-09-25 07:46:19 +0000
committerTom Tromey <tromey@gcc.gnu.org>2003-09-25 07:46:19 +0000
commitb9f42bb06092d78b84964ce1ce3af703bad2cc7d (patch)
treec440653c21ba6d47253f60036888a563bd7f60a2 /libjava/resolve.cc
parentd70f15d251b73bbddfd304f1f8ae2d7367dcc79f (diff)
downloadgcc-b9f42bb06092d78b84964ce1ce3af703bad2cc7d.zip
gcc-b9f42bb06092d78b84964ce1ce3af703bad2cc7d.tar.gz
gcc-b9f42bb06092d78b84964ce1ce3af703bad2cc7d.tar.bz2
Proxy.java (generate): Uncomment protection domain code.
* java/lang/reflect/Proxy.java (generate): Uncomment protection domain code. * java/lang/natClassLoader.cc (defineClass): Added `loader' argument. (linkClass0): Now in VMClassLoader. (markClassErrorState0): Likewise. (getSystemClassLoaderInternal): New method. * java/lang/natClass.cc (initializeClass): Use VMClassLoader::resolveClass. * java/lang/ClassLoader.java: New version, from Classpath. * java/lang/Class.java (getProtectionDomain): protectionDomainPermission and unknownProtectionDomain now in VMClassLoader. * java/lang/Class.h: VMClassLoader now a friend class. * gnu/gcj/runtime/VMClassLoader.java (instance): Now package-private. * gcj/javaprims.h: Regenerated class list. * resolve.cc (_Jv_PrepareClass): Use VMClassLoader::resolveClass. * java/lang/VMClassLoader.java: New version from Classpath; modified for libgcj use. From-SVN: r71765
Diffstat (limited to 'libjava/resolve.cc')
-rw-r--r--libjava/resolve.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libjava/resolve.cc b/libjava/resolve.cc
index d79affe..ce1af8d 100644
--- a/libjava/resolve.cc
+++ b/libjava/resolve.cc
@@ -32,6 +32,7 @@ details. */
#include <java/lang/AbstractMethodError.h>
#include <java/lang/NoClassDefFoundError.h>
#include <java/lang/IncompatibleClassChangeError.h>
+#include <java/lang/VMClassLoader.h>
#include <java/lang/reflect/Modifier.h>
using namespace gcj;
@@ -435,7 +436,7 @@ _Jv_PrepareClass(jclass klass)
// resolved.
if (klass->superclass)
- java::lang::ClassLoader::resolveClass0 (klass->superclass);
+ java::lang::VMClassLoader::resolveClass (klass->superclass);
_Jv_InterpClass *clz = (_Jv_InterpClass*)klass;