From 3ad1aba1f8d179027d2b5532d43024edfa7e903e Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Mon, 29 Jun 2009 17:50:59 +0000
Subject: re PR java/40590 (namespace namespace broken in CNI)

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590
	* tools/gnu/classpath/tools/javah/FieldHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Use printName().
	* tools/gnu/classpath/tools/javah/CniStubPrinter.java (printDecl):
	Use printName().
	* tools/gnu/classpath/tools/javah/Keywords.java (words): Replace
	with keywords list from  gcc/java/mangle.c.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java (printMethods):
	Don't pre-convert a C++ keyword.
	(print(CniPrintStream)): Call CniPrintStream.printName().
	(printContents): Likewise.
	* tools/gnu/classpath/tools/javah/CniPrintStream.java
	(getClassName): Don't call replaceAll("/", "::").
	(print(Type)): Add ""::" befor name, " *" after.  Use printName(), not
	print.
	(printName(PrintStream, String), printName(String), printlnName):
	New methods.
	(moveToPackage): Use printName().

2009-06-29  Andrew Haley  <aph@redhat.com>

	PR java/40590
	* java-tree.h (cxx_keyword_p): New declaration.
	* mangle_name.c (utf8_cmp): Move here from mangle.c.
	(cxx_keywords): Likewise.
	(cxx_keyword_p): Likewise.
	(MANGLE_CXX_KEYWORDS): New macro.
	(append_gpp_mangled_name): Use MANGLE_CXX_KEYWORDS.
	(append_gpp_mangled_name): Likewise.
	* mangle.c: Move code to mangle_name.c.
	(mangle_member_name): Don't call cxx_keyword_p.

From-SVN: r149059
---
 libjava/gnu/xml/stream/XMLParser.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libjava/gnu/xml/stream/XMLParser.h')

diff --git a/libjava/gnu/xml/stream/XMLParser.h b/libjava/gnu/xml/stream/XMLParser.h
index 0fb26669..319c2c4 100644
--- a/libjava/gnu/xml/stream/XMLParser.h
+++ b/libjava/gnu/xml/stream/XMLParser.h
@@ -39,7 +39,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -64,12 +64,12 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *);
   virtual ::java::util::Iterator * getPrefixes(::java::lang::String *);
   virtual void close();
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
   virtual jint getAttributeCount();
   virtual ::java::lang::String * getAttributeLocalName(jint);
   virtual ::java::lang::String * getAttributeNamespace(jint);
   virtual ::java::lang::String * getAttributePrefix(jint);
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
   virtual ::java::lang::String * getAttributeType(jint);
 private:
   ::java::lang::String * getAttributeType(::java::lang::String *, ::java::lang::String *);
@@ -85,7 +85,7 @@ public:
   virtual jint getEventType();
   virtual ::java::lang::String * getLocalName();
   virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual jint getNamespaceCount();
   virtual ::java::lang::String * getNamespacePrefix(jint);
   virtual ::java::lang::String * getNamespaceURI();
-- 
cgit v1.1