diff options
| author | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-05 11:03:36 +0000 |
|---|---|---|
| committer | aoliva <aoliva@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-05 11:03:36 +0000 |
| commit | facdfa4d25302559bad5e356dd90c7afc80551f7 (patch) | |
| tree | bc66a5a2a785e4a17f37e8af6777ba50ad16d46e /libjava/gnu/xml/xpath/LocalNameFunction.h | |
| parent | b176e1305a87b543c2cf4a1194d63a8cb0939da0 (diff) | |
Merged with trunk@149247.var-tracking-assignments-merge-149247-after
* tree-into-ssa.c (rewrite_stmt): Take iterator as argument.
Adjust caller.
* dwarf2out.c (mem_loc_descriptor): Adjust TLS SYMBOL_REF
handling.
* rtl.c (rtx_equal_p): Handle VALUE compares.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/var-tracking-assignments-branch@149256 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/xml/xpath/LocalNameFunction.h')
| -rw-r--r-- | libjava/gnu/xml/xpath/LocalNameFunction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/gnu/xml/xpath/LocalNameFunction.h b/libjava/gnu/xml/xpath/LocalNameFunction.h index 3de7c9a8658..2743e172624 100644 --- a/libjava/gnu/xml/xpath/LocalNameFunction.h +++ b/libjava/gnu/xml/xpath/LocalNameFunction.h @@ -24,7 +24,7 @@ extern "Java" { namespace xml { - namespace namespace + namespace namespace$ { class QName; } @@ -51,7 +51,7 @@ public: // actually package-private public: ::java::lang::Object * evaluate(::org::w3c::dom::Node *, jint, jint); ::gnu::xml::xpath::Expr * clone(::java::lang::Object *); - jboolean references(::javax::xml::namespace::QName *); + jboolean references(::javax::xml::namespace$::QName *); ::java::lang::String * toString(); public: // actually package-private ::gnu::xml::xpath::Expr * __attribute__((aligned(__alignof__( ::gnu::xml::xpath::Expr)))) arg; |