FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libjava/java/io/natObjectInputStream.cc
View file

@ -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;
}