Attachment #172265 for bug #242916




dnl Check for xerces
dnl ----------------------------------------
if test "$MINGW32" = yes; then
  AC_MSG_CHECKING([for Xerces 3 version])
  AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
      [AC_MSG_RESULT([found])],
      [AC_MSG_ERROR([not found])])      
   AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
else
  AC_MSG_CHECKING([for Xerces 3 version])
  AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
      xerces3exp="yes",
      xerces3exp="no")      
  if test "x$xerces3exp" = xyes; then
++ src/lev/ScoreManager.cc

    class ScoreDomSerFilter : public DOMWriterFilter {
#endif
        public:
#if _XERCES_VERSION >= 30000
            virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const;
#else
            virtual short acceptNode(const DOMNode *node) const;
#endif
            virtual unsigned long getWhatToShow () const {
                return DOMNodeFilter::SHOW_ALL;
            }
            virtual void setWhatToShow (unsigned long toShow) {}
    };
   
#if _XERCES_VERSION >= 30000
    DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
#else
    short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
#endif
	if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
                 std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {
            const DOMElement *e = dynamic_cast<const DOMElement *>(node);
            std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str();

Return to bug 242916

Lines 167-180 dnl ------------------------------------ Link Here

(-)configure.ac (-7 / +15 lines)
167	dnl Check for xerces	167	dnl Check for xerces
168	dnl ----------------------------------------	168	dnl ----------------------------------------
169	if test "$MINGW32" = yes; then	169	if test "$MINGW32" = yes; then
170	AC_MSG_CHECKING([for Xerces 3.0 experimental version])	170	AC_MSG_CHECKING([for Xerces 3 version])
171	AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],	171	AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
172	[AC_MSG_RESULT([found])],	172	[AC_MSG_RESULT([found])],
173	[AC_MSG_ERROR([not found])])	173	[AC_MSG_ERROR([not found])])
174	AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])	174	AC_CHECK_LIB(xerces, main,,[AC_MSG_ERROR([xerces is required to compile Enigma])])
175	else	175	else
176	AC_MSG_CHECKING([for Xerces 3.0 experimental version])	176	AC_MSG_CHECKING([for Xerces 3 version])
177	AC_EGREP_HEADER([gXercesMajVersion = 3],[xercesc/util/XercesVersion.hpp],	177	AC_EGREP_HEADER([XERCES_VERSION_MAJOR 3],[xercesc/util/XercesVersion.hpp],
178	xerces3exp="yes",	178	xerces3exp="yes",
179	xerces3exp="no")	179	xerces3exp="no")
180	if test "x$xerces3exp" = xyes; then	180	if test "x$xerces3exp" = xyes; then
181	-- src/lev/ScoreManager.cc	181	++ src/lev/ScoreManager.cc
Lines 65-79 Link Here
65	class ScoreDomSerFilter : public DOMWriterFilter {	65	class ScoreDomSerFilter : public DOMWriterFilter {
66	#endif	66	#endif
67	public:	67	public:
		68	#if _XERCES_VERSION >= 30000
		69	virtual DOMNodeFilter::FilterAction acceptNode(const DOMNode *node) const;
		70	#else
68	virtual short acceptNode(const DOMNode *node) const;	71	virtual short acceptNode(const DOMNode *node) const;
		72	#endif
69	virtual unsigned long getWhatToShow () const {	73	virtual unsigned long getWhatToShow () const {
70	return DOMNodeFilter::SHOW_ALL;	74	return DOMNodeFilter::SHOW_ALL;
71	}	75	}
72	virtual void setWhatToShow (unsigned long toShow) {}	76	virtual void setWhatToShow (unsigned long toShow) {}
73	};	77	};
74		78
		79	#if _XERCES_VERSION >= 30000
		80	DOMNodeFilter::FilterAction ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
		81	#else
75	short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {	82	short ScoreDomSerFilter::acceptNode(const DOMNode *node) const {
76	if (node->getNodeType () == DOMNode::ELEMENT_NODE &&	83	#endif
		84	if (node->getNodeType () == DOMNode::ELEMENT_NODE &&
77	std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {	85	std::string(XMLtoUtf8(node->getNodeName()).c_str()) == "level") {
78	const DOMElement e = dynamic_cast<const DOMElement >(node);	86	const DOMElement e = dynamic_cast<const DOMElement >(node);
79	std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str();	87	std::string id = XMLtoUtf8(e->getAttribute(Utf8ToXML("id").x_str())).c_str();