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/validation/xmlschema/XMLSchemaBuilder.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h')

diff --git a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
index 2d208af..ed1bc80 100644
--- a/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
+++ b/libjava/gnu/xml/validation/xmlschema/XMLSchemaBuilder.h
@@ -36,7 +36,7 @@ extern "Java"
   {
     namespace xml
     {
-      namespace namespace
+      namespace namespace$
       {
           class QName;
       }
@@ -77,7 +77,7 @@ public: // actually package-private
   virtual jint parseComplexTypeBlockSet(::java::lang::String *);
   virtual ::java::lang::Object * parseElement(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
   virtual ::java::lang::Integer * getOccurrence(::java::lang::String *);
-  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace::QName *);
+  virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::javax::xml::namespace$::QName *);
   virtual ::gnu::xml::validation::datatype::SimpleType * parseSimpleType(::org::w3c::dom::Node *);
   virtual ::gnu::xml::validation::datatype::Type * parseComplexType(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ElementDeclaration *);
   virtual void parseSimpleContent(::org::w3c::dom::Node *, ::gnu::xml::validation::xmlschema::ComplexType *);
@@ -87,7 +87,7 @@ public: // actually package-private
   virtual ::gnu::xml::validation::datatype::Annotation * parseAnnotation(::org::w3c::dom::Node *);
 private:
   static ::java::lang::String * getAttribute(::org::w3c::dom::NamedNodeMap *, ::java::lang::String *);
-  static ::javax::xml::namespace::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
+  static ::javax::xml::namespace$::QName * asQName(::java::lang::String *, ::org::w3c::dom::Node *);
 public: // actually package-private
   ::gnu::xml::validation::xmlschema::XMLSchema * __attribute__((aligned(__alignof__( ::java::lang::Object)))) schema;
   ::org::relaxng::datatype::DatatypeLibrary * typeLibrary;
-- 
cgit v1.1