diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-09 19:58:05 +0000 |
| commit | 97b8365cafc3a344a22d3980b8ed885f5c6d8357 (patch) | |
| tree | 996a5f57d4a68c53473382e45cb22f574cb3e4db /libjava/java/io/natObjectInputStream.cc | |
| parent | c648dedbde727ca3f883bb5fd773aa4af70d3369 (diff) | |
| download | gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.zip gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.gz gcc-97b8365cafc3a344a22d3980b8ed885f5c6d8357.tar.bz2 | |
Merged gcj-eclipse branch to trunk.
From-SVN: r120621
Diffstat (limited to 'libjava/java/io/natObjectInputStream.cc')
| -rw-r--r-- | libjava/java/io/natObjectInputStream.cc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libjava/java/io/natObjectInputStream.cc b/libjava/java/io/natObjectInputStream.cc index 2d1a556..6212396 100644 --- a/libjava/java/io/natObjectInputStream.cc +++ b/libjava/java/io/natObjectInputStream.cc @@ -1,6 +1,6 @@ -// natObjectInputStream.cc - Native part of ObjectInputStream class. +// natObjectInputStream.cc - Native part of VMObjectInputStream class. -/* Copyright (C) 1998, 1999, 2000, 2001, 2005 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006 Free Software Foundation This ObjectInputStream is part of libgcj. @@ -14,8 +14,7 @@ details. */ #include <jvm.h> #include <gcj/method.h> -#include <java/io/ObjectInputStream$GetField.h> -#include <java/io/ObjectInputStream.h> +#include <java/io/VMObjectInputStream.h> #include <java/io/IOException.h> #include <java/lang/Class.h> #include <java/lang/reflect/Modifier.h> @@ -32,7 +31,7 @@ details. */ #endif jobject -java::io::ObjectInputStream::allocateObject (jclass klass, jclass, +java::io::VMObjectInputStream::allocateObject (jclass klass, jclass, ::java::lang::reflect::Constructor *ctr) { jobject obj = NULL; @@ -69,12 +68,3 @@ java::io::ObjectInputStream::allocateObject (jclass klass, jclass, return obj; } - -java::lang::ClassLoader * -java::io::ObjectInputStream::currentLoader () -{ - jclass caller = _Jv_StackTrace::GetCallingClass (&ObjectInputStream::class$); - if (caller) - return caller->getClassLoaderInternal(); - return NULL; -} |