Checking in header files missed by earlier commit

From-SVN: r121672

diff --git a/libjava/java/lang/ClassLoader.h b/libjava/java/lang/ClassLoader.h
index 0b82a0467863b067f0d2503582e6fc030152a75a..ed6f5449adcec78611dbe02464a374e5deacce68 100644 (file)
--- a/libjava/java/lang/ClassLoader.h
+++ b/libjava/java/lang/ClassLoader.h
@@ -82,6 +82,9 @@ public:
   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:

diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h
index 62e4f647d7c0b7000933da4fb4e61122e6b8e292..a2f3b3ead16755daf2da8d817542401eb9474acd 100644 (file)
--- a/libjava/java/nio/charset/Charset.h
+++ b/libjava/java/nio/charset/Charset.h
@@ -62,10 +62,11 @@ public:
   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;

diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h
index 2cc0bef37bb6775c6848b4318ac43789a9f76927..bde84d5558a1884d8ffbaa7be1b63284e80ca8c5 100644 (file)
--- a/libjava/java/util/Calendar.h
+++ b/libjava/java/util/Calendar.h
@@ -66,12 +66,14 @@ public:
   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;