mirror of
https://github.com/jezhiggins/arabica
synced 2024-12-26 21:58:39 +01:00
Now uses default XMLReader instead of explicitly invoking expat.
This commit is contained in:
parent
94707d56dc
commit
e59dc1c62f
3 changed files with 5 additions and 14 deletions
|
@ -2,7 +2,6 @@
|
|||
#define JEZUK_SAX2DOM_PARSER_H
|
||||
|
||||
#include <SAX/XMLReader.h>
|
||||
#include <SAX/wrappers/saxexpat.h>
|
||||
#include <SAX/ext/DefaultHandler2.h>
|
||||
#include <SAX/helpers/AttributeTypes.h>
|
||||
#include <DOM/Simple/DOMImplementation.h>
|
||||
|
@ -19,7 +18,7 @@ namespace SAX2DOM
|
|||
|
||||
template<class stringT,
|
||||
class string_adaptorT = SAX::default_string_adaptor<stringT>,
|
||||
class SAX_parser = SAX::expat_wrapper<stringT, string_adaptorT> >
|
||||
class SAX_parser = SAX::XMLReader<stringT> >
|
||||
class Parser : private SAX::basic_DefaultHandler2<stringT>
|
||||
{
|
||||
typedef SAX::basic_EntityResolver<stringT> EntityResolverT;
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include <SAX/helpers/DefaultHandler.h>
|
||||
#include <SAX/InputSource.h>
|
||||
#include <SAX/wrappers/saxexpat.h>
|
||||
#include <SAX/XMLReader.h>
|
||||
#include <iostream>
|
||||
|
||||
class SAX2PYX : public SAX::DefaultHandler
|
||||
|
@ -49,7 +49,7 @@ int main(int argc, char* argv[])
|
|||
|
||||
for(int i = 1; i < argc; ++i)
|
||||
{
|
||||
SAX::expat_wrapper<std::string> myParser;
|
||||
SAX::XMLReader<std::string> myParser;
|
||||
myParser.setContentHandler(handler);
|
||||
myParser.setErrorHandler(handler);
|
||||
|
||||
|
|
|
@ -65,7 +65,7 @@ LINK32=link.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /W3 /Gm /GR /GX /ZI /Od /I "..\..\\" /I "\work\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "USE_MSXML" /YX /FD /GZ /c
|
||||
# SUBTRACT CPP /Fr
|
||||
# ADD BASE RSC /l 0x809 /d "_DEBUG"
|
||||
# ADD RSC /l 0x809 /d "_DEBUG"
|
||||
|
@ -74,7 +74,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\lib" /libpath:"\work\lib\vc6"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
@ -95,16 +95,8 @@ SOURCE=.\pyx.cpp
|
|||
# PROP Default_Filter "lib"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=\work\lib\vc6\expat.lib
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\lib\SAX.lib
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\lib\Utilities.lib
|
||||
# End Source File
|
||||
# End Group
|
||||
# End Target
|
||||
# End Project
|
||||
|
|
Loading…
Reference in a new issue