diff --git a/DOM/SAX2DOM/SAX2DOM.h b/DOM/SAX2DOM/SAX2DOM.h index 53cdefb6..cf86ce2e 100644 --- a/DOM/SAX2DOM/SAX2DOM.h +++ b/DOM/SAX2DOM/SAX2DOM.h @@ -2,7 +2,6 @@ #define JEZUK_SAX2DOM_PARSER_H #include -#include #include #include #include @@ -19,7 +18,7 @@ namespace SAX2DOM template, - class SAX_parser = SAX::expat_wrapper > + class SAX_parser = SAX::XMLReader > class Parser : private SAX::basic_DefaultHandler2 { typedef SAX::basic_EntityResolver EntityResolverT; diff --git a/examples/SAX/pyx.cpp b/examples/SAX/pyx.cpp index 57387c76..8841b879 100644 --- a/examples/SAX/pyx.cpp +++ b/examples/SAX/pyx.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include 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 myParser; + SAX::XMLReader myParser; myParser.setContentHandler(handler); myParser.setErrorHandler(handler); diff --git a/examples/SAX/pyx.dsp b/examples/SAX/pyx.dsp index 9970aa8b..f94924f5 100644 --- a/examples/SAX/pyx.dsp +++ b/examples/SAX/pyx.dsp @@ -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