Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-30 08:38:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wide character string fixes

Browse source
This commit is contained in:
jez_higgins 2003-09-10 08:47:37 +00:00
parent 374243b4d8
commit 27d574f2a8
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
SAX/wrappers/saxexpat.h
View file

@ -209,6 +209,8 @@ class expat_wrapper : public SAX::basic_XMLReader<string_type>,
typedef SAX::basic_InputSource<stringT> inputSourceT; typedef SAX::basic_InputSource<stringT> inputSourceT;
typedef SAX::basic_Locator<stringT> locatorT; typedef SAX::basic_Locator<stringT> locatorT;
typedef SAX::basic_NamespaceSupport<stringT, string_adaptorT> namespaceSupportT; typedef SAX::basic_NamespaceSupport<stringT, string_adaptorT> namespaceSupportT;
typedef SAX::basic_ErrorHandler<stringT> errorHandlerT;
typedef SAX::basic_SAXParseException<stringT> SAXParseExceptionT;
typedef typename SAX::basic_XMLReader<stringT>::PropertyBase PropertyBaseT; typedef typename SAX::basic_XMLReader<stringT>::PropertyBase PropertyBaseT;
expat_wrapper(); expat_wrapper();
@ -227,8 +229,8 @@ class expat_wrapper : public SAX::basic_XMLReader<string_type>,
virtual dtdHandlerT* getDTDHandler() const { return dtdHandler_; } virtual dtdHandlerT* getDTDHandler() const { return dtdHandler_; }
virtual void setContentHandler(contentHandlerT& handler) { contentHandler_ = &handler; } virtual void setContentHandler(contentHandlerT& handler) { contentHandler_ = &handler; }
virtual contentHandlerT* getContentHandler() const { return contentHandler_; } virtual contentHandlerT* getContentHandler() const { return contentHandler_; }
virtual void setErrorHandler(SAX::ErrorHandler& handler) { errorHandler_ = &handler; } virtual void setErrorHandler(errorHandlerT& handler) { errorHandler_ = &handler; }
virtual SAX::ErrorHandler* getErrorHandler() const { return errorHandler_; } virtual errorHandlerT* getErrorHandler() const { return errorHandler_; }
////////////////////////////////////////////////// //////////////////////////////////////////////////
// Parsing // Parsing
@ -302,7 +304,7 @@ class expat_wrapper : public SAX::basic_XMLReader<string_type>,
entityResolverT* entityResolver_; entityResolverT* entityResolver_;
dtdHandlerT* dtdHandler_; dtdHandlerT* dtdHandler_;
contentHandlerT* contentHandler_; contentHandlerT* contentHandler_;
SAX::ErrorHandler* errorHandler_; errorHandlerT* errorHandler_;
declHandlerT* declHandler_; declHandlerT* declHandler_;
lexicalHandlerT* lexicalHandler_; lexicalHandlerT* lexicalHandler_;
namespaceSupportT nsSupport_; namespaceSupportT nsSupport_;
@ -569,11 +571,11 @@ void expat_wrapper<stringT, string_adaptorT>::reportError(const std::string& mes
if(!errorHandler_) if(!errorHandler_)
return; return;
SAX::SAXParseException e(message, SAXParseExceptionT e(message,
SA_.asStdString(publicId_), publicId_,
SA_.asStdString(systemId_), systemId_,
XML_GetCurrentLineNumber(parser_), XML_GetCurrentLineNumber(parser_),
XML_GetCurrentColumnNumber(parser_)); XML_GetCurrentColumnNumber(parser_));
if(fatal) if(fatal)
errorHandler_->fatalError(e); errorHandler_->fatalError(e);
else else