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.



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

19 files changed, 52 insertions, 52 deletions

diff --git a/libjava/javax/xml/stream/XMLEventFactory.h b/libjava/javax/xml/stream/XMLEventFactory.h
index 8c8e4fe29c6..493ceef3db1 100644
--- a/libjava/javax/xml/stream/XMLEventFactory.h
+++ b/libjava/javax/xml/stream/XMLEventFactory.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -57,14 +57,14 @@ public:
   virtual void setLocation(::javax::xml::stream::Location *) = 0;
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Attribute * createAttribute(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace::QName *, ::java::lang::String *) = 0;
+  virtual ::javax::xml::stream::events::Attribute * createAttribute(::javax::xml::namespace$::QName *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::Namespace * createNamespace(::java::lang::String *, ::java::lang::String *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
+  virtual ::javax::xml::stream::events::StartElement * createStartElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *) = 0;
-  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace::QName *, ::java::util::Iterator *) = 0;
+  virtual ::javax::xml::stream::events::StartElement * createStartElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *, ::java::util::Iterator *, ::javax::xml::namespace$::NamespaceContext *) = 0;
+  virtual ::javax::xml::stream::events::EndElement * createEndElement(::javax::xml::namespace$::QName *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *) = 0;
   virtual ::javax::xml::stream::events::EndElement * createEndElement(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Iterator *) = 0;
   virtual ::javax::xml::stream::events::Characters * createCharacters(::java::lang::String *) = 0;
diff --git a/libjava/javax/xml/stream/XMLEventWriter.h b/libjava/javax/xml/stream/XMLEventWriter.h
index 7762e629b4b..9ed0aa1df47 100644
--- a/libjava/javax/xml/stream/XMLEventWriter.h
+++ b/libjava/javax/xml/stream/XMLEventWriter.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
       }
@@ -41,8 +41,8 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
   virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
+  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/javax/xml/stream/XMLStreamReader.h b/libjava/javax/xml/stream/XMLStreamReader.h
index b0632932093..47b49b40814 100644
--- a/libjava/javax/xml/stream/XMLStreamReader.h
+++ b/libjava/javax/xml/stream/XMLStreamReader.h
@@ -15,7 +15,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -47,7 +47,7 @@ public:
   virtual jboolean isWhiteSpace() = 0;
   virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *) = 0;
   virtual jint getAttributeCount() = 0;
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint) = 0;
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint) = 0;
   virtual ::java::lang::String * getAttributeNamespace(jint) = 0;
   virtual ::java::lang::String * getAttributeLocalName(jint) = 0;
   virtual ::java::lang::String * getAttributePrefix(jint) = 0;
@@ -57,7 +57,7 @@ public:
   virtual jint getNamespaceCount() = 0;
   virtual ::java::lang::String * getNamespacePrefix(jint) = 0;
   virtual ::java::lang::String * getNamespaceURI(jint) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
   virtual jint getEventType() = 0;
   virtual ::java::lang::String * getText() = 0;
   virtual JArray< jchar > * getTextCharacters() = 0;
@@ -67,7 +67,7 @@ public:
   virtual ::java::lang::String * getEncoding() = 0;
   virtual jboolean hasText() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
-  virtual ::javax::xml::namespace::QName * getName() = 0;
+  virtual ::javax::xml::namespace$::QName * getName() = 0;
   virtual ::java::lang::String * getLocalName() = 0;
   virtual jboolean hasName() = 0;
   virtual ::java::lang::String * getNamespaceURI() = 0;
diff --git a/libjava/javax/xml/stream/XMLStreamWriter.h b/libjava/javax/xml/stream/XMLStreamWriter.h
index 74230ca7c82..e4bed463c00 100644
--- a/libjava/javax/xml/stream/XMLStreamWriter.h
+++ b/libjava/javax/xml/stream/XMLStreamWriter.h
@@ -15,7 +15,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
       }
@@ -60,8 +60,8 @@ public:
   virtual ::java::lang::String * getPrefix(::java::lang::String *) = 0;
   virtual void setPrefix(::java::lang::String *, ::java::lang::String *) = 0;
   virtual void setDefaultNamespace(::java::lang::String *) = 0;
-  virtual void setNamespaceContext(::javax::xml::namespace::NamespaceContext *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
+  virtual void setNamespaceContext(::javax::xml::namespace$::NamespaceContext *) = 0;
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
   virtual ::java::lang::Object * getProperty(::java::lang::String *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/Attribute.h b/libjava/javax/xml/stream/events/Attribute.h
index f0e057063be..d4e42b5a5f2 100644
--- a/libjava/javax/xml/stream/events/Attribute.h
+++ b/libjava/javax/xml/stream/events/Attribute.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -36,7 +36,7 @@ class javax::xml::stream::events::Attribute : public ::java::lang::Object
 {
 
 public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
+  virtual ::javax::xml::namespace$::QName * getName() = 0;
   virtual ::java::lang::String * getValue() = 0;
   virtual ::java::lang::String * getDTDType() = 0;
   virtual jboolean isSpecified() = 0;
@@ -54,7 +54,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/Characters.h b/libjava/javax/xml/stream/events/Characters.h
index f1511881f0e..539d45f3cd9 100644
--- a/libjava/javax/xml/stream/events/Characters.h
+++ b/libjava/javax/xml/stream/events/Characters.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/Comment.h b/libjava/javax/xml/stream/events/Comment.h
index 1f945ea19fc..ba81b85a845 100644
--- a/libjava/javax/xml/stream/events/Comment.h
+++ b/libjava/javax/xml/stream/events/Comment.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -51,7 +51,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/DTD.h b/libjava/javax/xml/stream/events/DTD.h
index daaa23fa124..2932d6871f4 100644
--- a/libjava/javax/xml/stream/events/DTD.h
+++ b/libjava/javax/xml/stream/events/DTD.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -54,7 +54,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/EndDocument.h b/libjava/javax/xml/stream/events/EndDocument.h
index 984585490bd..e3cdc98db26 100644
--- a/libjava/javax/xml/stream/events/EndDocument.h
+++ b/libjava/javax/xml/stream/events/EndDocument.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/EndElement.h b/libjava/javax/xml/stream/events/EndElement.h
index 86825d6e463..b67f2bb183d 100644
--- a/libjava/javax/xml/stream/events/EndElement.h
+++ b/libjava/javax/xml/stream/events/EndElement.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -35,7 +35,7 @@ class javax::xml::stream::events::EndElement : public ::java::lang::Object
 {
 
 public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
+  virtual ::javax::xml::namespace$::QName * getName() = 0;
   virtual ::java::util::Iterator * getNamespaces() = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
@@ -51,7 +51,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/EntityDeclaration.h b/libjava/javax/xml/stream/events/EntityDeclaration.h
index 98eda7a3ea5..f4075edc44a 100644
--- a/libjava/javax/xml/stream/events/EntityDeclaration.h
+++ b/libjava/javax/xml/stream/events/EntityDeclaration.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/EntityReference.h b/libjava/javax/xml/stream/events/EntityReference.h
index ba95d54584b..548bbc6b335 100644
--- a/libjava/javax/xml/stream/events/EntityReference.h
+++ b/libjava/javax/xml/stream/events/EntityReference.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/Namespace.h b/libjava/javax/xml/stream/events/Namespace.h
index 5690c2305dc..470b22bc46c 100644
--- a/libjava/javax/xml/stream/events/Namespace.h
+++ b/libjava/javax/xml/stream/events/Namespace.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/NotationDeclaration.h b/libjava/javax/xml/stream/events/NotationDeclaration.h
index e5c6ba0183a..c60a79ebc52 100644
--- a/libjava/javax/xml/stream/events/NotationDeclaration.h
+++ b/libjava/javax/xml/stream/events/NotationDeclaration.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -53,7 +53,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/ProcessingInstruction.h b/libjava/javax/xml/stream/events/ProcessingInstruction.h
index 3a5f9944fa6..79f969d6985 100644
--- a/libjava/javax/xml/stream/events/ProcessingInstruction.h
+++ b/libjava/javax/xml/stream/events/ProcessingInstruction.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -52,7 +52,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/StartDocument.h b/libjava/javax/xml/stream/events/StartDocument.h
index 2658939a791..112e600316e 100644
--- a/libjava/javax/xml/stream/events/StartDocument.h
+++ b/libjava/javax/xml/stream/events/StartDocument.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -56,7 +56,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/StartElement.h b/libjava/javax/xml/stream/events/StartElement.h
index 0695267421d..2dd50e6c87c 100644
--- a/libjava/javax/xml/stream/events/StartElement.h
+++ b/libjava/javax/xml/stream/events/StartElement.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -37,11 +37,11 @@ class javax::xml::stream::events::StartElement : public ::java::lang::Object
 {
 
 public:
-  virtual ::javax::xml::namespace::QName * getName() = 0;
+  virtual ::javax::xml::namespace$::QName * getName() = 0;
   virtual ::java::util::Iterator * getAttributes() = 0;
   virtual ::java::util::Iterator * getNamespaces() = 0;
-  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *) = 0;
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext() = 0;
+  virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *) = 0;
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext() = 0;
   virtual ::java::lang::String * getNamespaceURI(::java::lang::String *) = 0;
   virtual jint getEventType() = 0;
   virtual ::javax::xml::stream::Location * getLocation() = 0;
@@ -57,7 +57,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/events/XMLEvent.h b/libjava/javax/xml/stream/events/XMLEvent.h
index 54d775d41e0..837f2a89474 100644
--- a/libjava/javax/xml/stream/events/XMLEvent.h
+++ b/libjava/javax/xml/stream/events/XMLEvent.h
@@ -13,7 +13,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -50,7 +50,7 @@ public:
   virtual ::javax::xml::stream::events::StartElement * asStartElement() = 0;
   virtual ::javax::xml::stream::events::EndElement * asEndElement() = 0;
   virtual ::javax::xml::stream::events::Characters * asCharacters() = 0;
-  virtual ::javax::xml::namespace::QName * getSchemaType() = 0;
+  virtual ::javax::xml::namespace$::QName * getSchemaType() = 0;
   virtual void writeAsEncodedUnicode(::java::io::Writer *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
diff --git a/libjava/javax/xml/stream/util/ReaderDelegate.h b/libjava/javax/xml/stream/util/ReaderDelegate.h
index 4235d0dcd14..0a887d1ee9a 100644
--- a/libjava/javax/xml/stream/util/ReaderDelegate.h
+++ b/libjava/javax/xml/stream/util/ReaderDelegate.h
@@ -15,7 +15,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class NamespaceContext;
           class QName;
@@ -48,14 +48,14 @@ public:
   virtual jboolean hasNext();
   virtual void close();
   virtual ::java::lang::String * getNamespaceURI(::java::lang::String *);
-  virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext();
+  virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext();
   virtual jboolean isStartElement();
   virtual jboolean isEndElement();
   virtual jboolean isCharacters();
   virtual jboolean isWhiteSpace();
   virtual ::java::lang::String * getAttributeValue(::java::lang::String *, ::java::lang::String *);
   virtual jint getAttributeCount();
-  virtual ::javax::xml::namespace::QName * getAttributeName(jint);
+  virtual ::javax::xml::namespace$::QName * getAttributeName(jint);
   virtual ::java::lang::String * getAttributePrefix(jint);
   virtual ::java::lang::String * getAttributeNamespace(jint);
   virtual ::java::lang::String * getAttributeLocalName(jint);
@@ -74,7 +74,7 @@ public:
   virtual ::java::lang::String * getEncoding();
   virtual jboolean hasText();
   virtual ::javax::xml::stream::Location * getLocation();
-  virtual ::javax::xml::namespace::QName * getName();
+  virtual ::javax::xml::namespace$::QName * getName();
   virtual ::java::lang::String * getLocalName();
   virtual jboolean hasName();
   virtual ::java::lang::String * getNamespaceURI();