Attachment 394809 Details for Bug 565050 – additional patch file

[patch] additional patch file

xerces-c-3.patch (text/plain), 2.11 KB, created by Johan De Taeye on 2010-02-17 20:17:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johan De Taeye

Created: 2010-02-17 20:17:53 UTC

Size: 2.11 KB

patch

obsolete

>diff -crB frepple-0.7.1/include/frepple/utils.h frepple-0.7.1-xercesc3/include/frepple/utils.h
>*** frepple-0.7.1/include/frepple/utils.h	2009-07-31 19:14:14.000000000 +0200
>--- frepple-0.7.1-xercesc3/include/frepple/utils.h	2010-02-15 22:35:03.000000000 +0100
>***************
>*** 144,151 ****
>  
>  // Header files for the Xerces-c XML parser.
>  #ifndef DOXYGEN
>! #define XERCES_NEW_IOSTREAMS
>! #define XML_LIBRARY
>  #include <xercesc/util/PlatformUtils.hpp>
>  #include <xercesc/sax2/SAX2XMLReader.hpp>
>  #include <xercesc/sax2/Attributes.hpp>
>--- 144,150 ----
>  
>  // Header files for the Xerces-c XML parser.
>  #ifndef DOXYGEN
>! #define XERCES_STATIC_LIBRARY
>  #include <xercesc/util/PlatformUtils.hpp>
>  #include <xercesc/sax2/SAX2XMLReader.hpp>
>  #include <xercesc/sax2/Attributes.hpp>
>***************
>*** 3305,3311 ****
>      /** Handler called when character data are read in.
>        * The data string is add it to the current element data.
>        */
>!     void characters(const XMLCh *const, const unsigned int);
>  
>      /** Handler called by Xerces in fatal error conditions. It throws an
>        * exception to abort the parsing procedure. */
>--- 3304,3310 ----
>      /** Handler called when character data are read in.
>        * The data string is add it to the current element data.
>        */
>!     void characters(const XMLCh *const, const XMLSize_t);
>  
>      /** Handler called by Xerces in fatal error conditions. It throws an
>        * exception to abort the parsing procedure. */
>diff -crB frepple-0.7.1/src/utils/xmlparser.cpp frepple-0.7.1-xercesc3/src/utils/xmlparser.cpp
>*** frepple-0.7.1/src/utils/xmlparser.cpp	2009-06-06 12:37:41.000000000 +0200
>--- frepple-0.7.1-xercesc3/src/utils/xmlparser.cpp	2010-02-15 22:35:47.000000000 +0100
>***************
>*** 313,319 ****
>  }
>  
>  
>! void XMLInput::characters(const XMLCh *const c, const unsigned int n)
>  {
>    // No data capture during the ignore state
>    if (states.top()==IGNOREINPUT) return;
>--- 313,319 ----
>  }
>  
>  
>! void XMLInput::characters(const XMLCh *const c, const XMLSize_t n)
>  {
>    // No data capture during the ignore state
>    if (states.top()==IGNOREINPUT) return;

Actions: View | Diff

Attachments on bug 565050: 393230 | 393231 | 393232 | 394809 | 394810