diff options
| author | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-29 17:50:59 +0000 |
|---|---|---|
| committer | aph <aph@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-06-29 17:50:59 +0000 |
| commit | fce8df1021b8e76afd5e8f909557826fcbf3ff19 (patch) | |
| tree | 3cfe7282cd5664c854b8f591c178d778224cc35e /libjava/gnu/xml/xpath/XPathParser.h | |
| parent | d6d765b4a20ee056454dc87d9e002cd2f5ebb42d (diff) | |
| download | gcc-fce8df1021b8e76afd5e8f909557826fcbf3ff19.tar.gz | |
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
Diffstat (limited to 'libjava/gnu/xml/xpath/XPathParser.h')
| -rw-r--r-- | libjava/gnu/xml/xpath/XPathParser.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/gnu/xml/xpath/XPathParser.h b/libjava/gnu/xml/xpath/XPathParser.h index 13c48744ff1..0133a04512d 100644 --- a/libjava/gnu/xml/xpath/XPathParser.h +++ b/libjava/gnu/xml/xpath/XPathParser.h @@ -27,7 +27,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class NamespaceContext; class QName; @@ -47,7 +47,7 @@ class gnu::xml::xpath::XPathParser : public ::java::lang::Object public: XPathParser(); public: // actually package-private - virtual ::javax::xml::namespace::QName * getQName(::java::lang::String *); + virtual ::javax::xml::namespace$::QName * getQName(::java::lang::String *); virtual ::gnu::xml::xpath::Expr * lookupFunction(::java::lang::String *, ::java::util::List *); public: virtual void yyerror(::java::lang::String *); @@ -61,7 +61,7 @@ public: // actually protected public: virtual ::java::lang::Object * yyparse(::gnu::xml::xpath::XPathParser$yyInput *); public: // actually package-private - ::javax::xml::namespace::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext; + ::javax::xml::namespace$::NamespaceContext * __attribute__((aligned(__alignof__( ::java::lang::Object)))) namespaceContext; ::javax::xml::xpath::XPathVariableResolver * variableResolver; ::javax::xml::xpath::XPathFunctionResolver * functionResolver; public: |