From 1020ce5944edde4364baef4d371cd4f9b0dae721 Mon Sep 17 00:00:00 2001 From: doko Date: Sat, 28 Jun 2008 13:29:13 +0000 Subject: libjava/ 2008-06-28 Matthias Klose Import GNU Classpath (classpath-0_97_2-release). * Regenerate class and header files. * Regenerate auto* files. * gcj/javaprims.h: Define jobjectRefType. * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only). (_Jv_JNIFunctions): Initialize GetObjectRefType. * gnu/classpath/jdwp/VMVirtualMachine.java, java/security/VMSecureRandom.java: Merge from classpath. * HACKING: Fix typo. * ChangeLog-2007: New file. * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath. libjava/classpath/ 2008-06-28 Matthias Klose * m4/ac_prog_javac.m4: Disable check for JAVAC, when not configured with --enable-java-maintainer-mode. * aclocal.m4, configure: Regenerate. * native/jni/gstreamer-peer/Makefile.am: Do not link with libclasspathnative. * native/jni/gstreamer-peer/Makefile.in: Regenerate. * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting JCOMPILER, drop flags not understood by gcj. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java | 4 ++-- .../org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libjava/classpath/org/omg/PortableServer') diff --git a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java index d5d5751b9e7..0ebbc7e41b1 100644 --- a/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java +++ b/libjava/classpath/org/omg/PortableServer/ForwardRequestHelper.java @@ -114,7 +114,7 @@ public abstract class ForwardRequestHelper public static ForwardRequest read(InputStream input) { // Read the exception repository id. - String id = input.read_string(); + input.read_string(); ForwardRequest value = new ForwardRequest(); value.forward_reference = input.read_Object(); @@ -151,4 +151,4 @@ public abstract class ForwardRequestHelper output.write_string(id()); output.write_Object(value.forward_reference); } -} \ No newline at end of file +} diff --git a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java index 32ddae8586f..cb3c6702442 100644 --- a/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java +++ b/libjava/classpath/org/omg/PortableServer/POAPackage/InvalidPolicyHelper.java @@ -136,7 +136,7 @@ public abstract class InvalidPolicyHelper public static InvalidPolicy read(InputStream input) { // Read the exception repository id. - String id = input.read_string(); + input.read_string(); InvalidPolicy value = new InvalidPolicy(); value.index = input.read_short(); @@ -155,4 +155,4 @@ public abstract class InvalidPolicyHelper output.write_string(id()); output.write_short(value.index); } -} \ No newline at end of file +} -- cgit v1.2.3