This is the mail archive of the
java@gcc.gnu.org
mailing list for the Java project.
Changed .h files after maintainer build
- From: Marco Trudel <mtrudel at gmx dot ch>
- To: GCC Java <java at gcc dot gnu dot org>
- Date: Tue, 06 Feb 2007 17:59:50 +0100
- Subject: Changed .h files after maintainer build
Hey all
svn shows me three unexpected modified header files after a build;
java/nio/charset/Charset.h
java/util/Calendar.h
java/lang/ClassLoader.h
My gjavah is:
#! /bin/sh
cp=/usr/local/src/gcc/libjava/classpath/tools/classes:/usr/local/src/gcc/libjava/classpath/tools/asm:/usr/local/src/gcc/libjava/classpath/resource
java -Xmx512m -cp $cp gnu.classpath.tools.javah.Main ${1+"$@"}
So I guess I do not use an outdated gjavah :-)
Anyone forgot to commit them or does it look like a problem? With recent
builds (around > 121200) I have new problems with JNI. Might be
correlated... I'm currently trying to figure out the cause...
Marco
Index: libjava/java/nio/charset/Charset.h
===================================================================
--- libjava/java/nio/charset/Charset.h (revision 121646)
+++ libjava/java/nio/charset/Charset.h (working copy)
@@ -62,10 +62,11 @@
virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
virtual ::java::nio::ByteBuffer * encode(::java::lang::String *);
virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
- virtual jint compareTo(::java::lang::Object *);
+ virtual jint target$compareTo(::java::nio::charset::Charset *);
virtual jint hashCode();
virtual jboolean equals(::java::lang::Object *);
virtual ::java::lang::String * toString();
+ virtual jint compareTo(::java::lang::Object *);
private:
::java::nio::charset::CharsetEncoder * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cachedEncoder;
::java::nio::charset::CharsetDecoder * cachedDecoder;
Index: libjava/java/util/Calendar.h
===================================================================
--- libjava/java/util/Calendar.h (revision 121646)
+++ libjava/java/util/Calendar.h (working copy)
@@ -66,12 +66,14 @@
virtual jint getLeastMaximum(jint) = 0;
virtual jint getActualMinimum(jint);
virtual jint getActualMaximum(jint);
+ virtual jint target$compareTo(::java::util::Calendar *);
virtual ::java::lang::Object * clone();
virtual ::java::lang::String * toString();
private:
void writeObject(::java::io::ObjectOutputStream *);
void readObject(::java::io::ObjectInputStream *);
public:
+ virtual jint compareTo(::java::lang::Object *);
static const jint ERA = 0;
static const jint YEAR = 1;
static const jint MONTH = 2;
Index: libjava/java/lang/ClassLoader.h
===================================================================
--- libjava/java/lang/ClassLoader.h (revision 121646)
+++ libjava/java/lang/ClassLoader.h (working copy)
@@ -82,6 +82,9 @@
virtual void clearAssertionStatus();
public: // actually package-private
virtual jboolean isAncestorOf(::java::lang::ClassLoader *);
+private:
+ void checkInitialized();
+public: // actually package-private
::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) loadedClasses;
::java::util::HashMap * definedPackages;
private: