libjava

	* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123965 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 5 insertions, 5 deletions

diff --git a/libjava/javax/imageio/ImageIO$1.h b/libjava/javax/imageio/ImageIO$1.h
index 5c3ae21e031..ba1077fd49f 100644
--- a/libjava/javax/imageio/ImageIO$1.h
+++ b/libjava/javax/imageio/ImageIO$1.h
@@ -26,7 +26,7 @@ public: // actually package-private
   ImageIO$1(::java::util::Iterator *);
 public:
   jboolean hasNext();
-  ::javax::imageio::ImageTranscoder * target$next();
+  ::javax::imageio::ImageTranscoder * ImageIO$1$next();
   void remove();
   ::java::lang::Object * next();
 private:
diff --git a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
index 5288ca9254c..bb0285eee30 100644
--- a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
+++ b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h
@@ -26,7 +26,7 @@ public:
   ImageIO$ImageReaderIterator(::java::util::Iterator *, ::java::lang::Object *);
   ImageIO$ImageReaderIterator(::java::util::Iterator *);
   jboolean hasNext();
-  ::javax::imageio::ImageReader * target$next();
+  ::javax::imageio::ImageReader * ImageIO$ImageReaderIterator$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
index 78f74fb2649..dcf9101f00d 100644
--- a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
+++ b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h
@@ -26,7 +26,7 @@ public:
   ImageIO$ImageWriterIterator(::java::util::Iterator *, ::java::lang::Object *);
   ImageIO$ImageWriterIterator(::java::util::Iterator *);
   jboolean hasNext();
-  ::javax::imageio::ImageWriter * target$next();
+  ::javax::imageio::ImageWriter * ImageIO$ImageWriterIterator$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.h b/libjava/javax/print/attribute/standard/JobStateReasons.h
index 4e5fce82d60..e02a3e7e99b 100644
--- a/libjava/javax/print/attribute/standard/JobStateReasons.h
+++ b/libjava/javax/print/attribute/standard/JobStateReasons.h
@@ -33,7 +33,7 @@ public:
   JobStateReasons(jint, jfloat);
   JobStateReasons(jint);
   JobStateReasons(::java::util::Collection *);
-  jboolean target$add(::javax::print::attribute::standard::JobStateReason *);
+  jboolean JobStateReasons$add(::javax::print::attribute::standard::JobStateReason *);
   ::java::lang::Class * getCategory();
   ::java::lang::String * getName();
   jboolean add(::java::lang::Object *);
diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.h b/libjava/javax/print/attribute/standard/PrinterStateReasons.h
index bedc8b81d54..fc3d70330e4 100644
--- a/libjava/javax/print/attribute/standard/PrinterStateReasons.h
+++ b/libjava/javax/print/attribute/standard/PrinterStateReasons.h
@@ -35,7 +35,7 @@ public:
   PrinterStateReasons(jint);
   PrinterStateReasons(::java::util::Map *);
   ::java::util::Set * printerStateReasonSet(::javax::print::attribute::standard::Severity *);
-  ::javax::print::attribute::standard::Severity * target$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *);
+  ::javax::print::attribute::standard::Severity * PrinterStateReasons$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *);
   ::java::lang::Class * getCategory();
   ::java::lang::String * getName();
   ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);