2008-10-23 Basile Starynkevitch <basile@starynkevitch.net>

	MELT branch merged with trunk r141325



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@141329 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 2 deletions

diff --git a/libjava/gnu/xml/transform/ParameterNode.h b/libjava/gnu/xml/transform/ParameterNode.h
index 6a815cfafd8..aebd3e05054 100644
--- a/libjava/gnu/xml/transform/ParameterNode.h
+++ b/libjava/gnu/xml/transform/ParameterNode.h
@@ -52,14 +52,18 @@ class gnu::xml::transform::ParameterNode : public ::gnu::xml::transform::Templat
 
 public: // actually package-private
   ParameterNode(::javax::xml::namespace::QName *, ::gnu::xml::xpath::Expr *, jint);
-  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
+  ::gnu::xml::transform::ParameterNode * ParameterNode$clone(::gnu::xml::transform::Stylesheet *);
   void doApply(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint, ::org::w3c::dom::Node *, ::org::w3c::dom::Node *);
   ::java::lang::Object * getValue(::gnu::xml::transform::Stylesheet *, ::javax::xml::namespace::QName *, ::org::w3c::dom::Node *, jint, jint);
 public:
   jboolean references(::javax::xml::namespace::QName *);
-  jint compareTo(::java::lang::Object *);
+  jint ParameterNode$compareTo(::gnu::xml::transform::ParameterNode *);
   ::java::lang::String * toString();
 public: // actually package-private
+  ::gnu::xml::transform::TemplateNode * clone(::gnu::xml::transform::Stylesheet *);
+public:
+  jint compareTo(::java::lang::Object *);
+public: // actually package-private
   ::javax::xml::namespace::QName * __attribute__((aligned(__alignof__( ::gnu::xml::transform::TemplateNode)))) name;
   ::gnu::xml::xpath::Expr * select;
   jint type;