--- parser3/src/classes/xnode.C	2015/04/08 18:08:52	1.89
+++ parser3/src/classes/xnode.C	2016/04/11 22:58:57	1.94
@@ -1,7 +1,7 @@
 /** @file
 	Parser: @b dom parser class.
 
-	Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 #include "classes.h"
@@ -21,11 +21,7 @@
 #include "libxml/xpath.h"
 #include "libxml/xpathInternals.h"
 
-volatile const char * IDENT_XNODE_C="$Id: xnode.C,v 1.89 2015/04/08 18:08:52 moko Exp $" IDENT_XNODE_H;
-
-// global variable
-
-DECLARE_CLASS_VAR(xnode, new MXnode, 0);
+volatile const char * IDENT_XNODE_C="$Id: xnode.C,v 1.94 2016/04/11 22:58:57 moko Exp $" IDENT_XNODE_H;
 
 // classes
 
@@ -869,9 +865,7 @@ static void _selectString(Request& r, Me
 // constructor
 
 /// @bug one can change const and ruin other's work, we need unchangable VIntConst class
-MXnode::MXnode(const char* aname, VStateless_class *abase):
-	Methoded(aname?aname:"xnode", abase)
-{
+MXnode::MXnode(const char* aname): Methoded(aname?aname:"xnode") {
 	/// DOM1 node
 
 	// Node insertBefore(in Node newChild,in Node refChild) raises(DOMException);
@@ -943,10 +937,8 @@ MXnode::MXnode(const char* aname, VState
 
 	// consts
 
-#define CONST(name) \
-	consts.put(String::Body(#name), new VInt(XML_##name))
-#define CONST2(name, value) \
-	consts.put(String::Body(#name), new VInt(value))
+#define CONST(name) consts.put(#name, new VInt(XML_##name))
+#define CONST2(name, value) consts.put(#name, new VInt(value))
 
 	CONST(ELEMENT_NODE);
 	CONST(ATTRIBUTE_NODE);
@@ -962,10 +954,4 @@ MXnode::MXnode(const char* aname, VState
 	CONST(NOTATION_NODE);
 }
 
-#else
-
-// global variable
-
-DECLARE_CLASS_VAR(xnode, 0, 0); // fictive
-
 #endif