diff options
| author | Andrew Haley <aph@redhat.com> | 2009-06-29 17:50:59 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2009-06-29 17:50:59 +0000 |
| commit | 3ad1aba1f8d179027d2b5532d43024edfa7e903e (patch) | |
| tree | 3cfe7282cd5664c854b8f591c178d778224cc35e /libjava/gnu/xml/stream/StartElementImpl.h | |
| parent | 356ecb153076b45d402faf66da6812e01e276906 (diff) | |
| download | gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.zip gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.tar.gz gcc-3ad1aba1f8d179027d2b5532d43024edfa7e903e.tar.bz2 | |
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
Diffstat (limited to 'libjava/gnu/xml/stream/StartElementImpl.h')
| -rw-r--r-- | libjava/gnu/xml/stream/StartElementImpl.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libjava/gnu/xml/stream/StartElementImpl.h b/libjava/gnu/xml/stream/StartElementImpl.h index 13b1dc6..1cd062b 100644 --- a/libjava/gnu/xml/stream/StartElementImpl.h +++ b/libjava/gnu/xml/stream/StartElementImpl.h @@ -23,7 +23,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -44,21 +44,21 @@ class gnu::xml::stream::StartElementImpl : public ::gnu::xml::stream::XMLEventIm { public: // actually protected - StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace::NamespaceContext *); + StartElementImpl(::javax::xml::stream::Location *, ::javax::xml::namespace$::QName *, ::java::util::List *, ::java::util::List *, ::javax::xml::namespace$::NamespaceContext *); public: virtual jint getEventType(); - virtual ::javax::xml::namespace::QName * getName(); + virtual ::javax::xml::namespace$::QName * getName(); virtual ::java::util::Iterator * getAttributes(); virtual ::java::util::Iterator * getNamespaces(); - virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace::QName *); - virtual ::javax::xml::namespace::NamespaceContext * getNamespaceContext(); + virtual ::javax::xml::stream::events::Attribute * getAttributeByName(::javax::xml::namespace$::QName *); + virtual ::javax::xml::namespace$::NamespaceContext * getNamespaceContext(); virtual ::java::lang::String * getNamespaceURI(::java::lang::String *); virtual void writeAsEncodedUnicode(::java::io::Writer *); public: // actually protected - ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; + ::javax::xml::namespace$::QName * __attribute__((aligned(__alignof__( ::gnu::xml::stream::XMLEventImpl)))) name; ::java::util::List * attributes; ::java::util::List * namespaces; - ::javax::xml::namespace::NamespaceContext * namespaceContext; + ::javax::xml::namespace$::NamespaceContext * namespaceContext; public: static ::java::lang::Class class$; }; |