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/gnu/CORBA/Interceptor/IORInterceptors.java | 1 - libjava/classpath/gnu/CORBA/Interceptor/Registrator.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'libjava/classpath/gnu/CORBA/Interceptor') diff --git a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java index 2b77de58e0e..d8dcabf120f 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/IORInterceptors.java @@ -42,7 +42,6 @@ import org.omg.CORBA.OBJ_ADAPTER; import org.omg.CORBA.OMGVMCID; import org.omg.PortableInterceptor.IORInfo; import org.omg.PortableInterceptor.IORInterceptor; -import org.omg.PortableInterceptor.IORInterceptorOperations; import org.omg.PortableInterceptor.IORInterceptor_3_0Operations; import org.omg.PortableInterceptor.ObjectReferenceTemplate; diff --git a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java index 4bb895bb376..e0ce16a1496 100644 --- a/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java +++ b/libjava/classpath/gnu/CORBA/Interceptor/Registrator.java @@ -142,7 +142,7 @@ public class Registrator extends LocalObject implements ORBInitInfo * Create the interceptor collection from the given properties, using the * agreed naming convention. * - * @param orb the ORB being initialised. + * @param an_orb the ORB being initialised. * @param props the cumulated set of properties where the orb initializer * pattern is searched. * @param an_args the argument string array, passed to ORB.init. -- cgit v1.2.3