--- parser3/src/classes/xnode.C 2015/04/08 18:08:52 1.89 +++ parser3/src/classes/xnode.C 2016/03/31 21:46:20 1.92 @@ -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 (http://paf.design.ru) */ #include "classes.h" @@ -21,11 +21,11 @@ #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; +volatile const char * IDENT_XNODE_C="$Id: xnode.C,v 1.92 2016/03/31 21:46:20 moko Exp $" IDENT_XNODE_H; // global variable -DECLARE_CLASS_VAR(xnode, new MXnode, 0); +DECLARE_CLASS_VAR(xnode, new MXnode); // classes @@ -943,10 +943,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); @@ -966,6 +964,6 @@ MXnode::MXnode(const char* aname, VState // global variable -DECLARE_CLASS_VAR(xnode, 0, 0); // fictive +DECLARE_CLASS_VAR(xnode, 0); // fictive #endif