From f2ec36ab5fa04e11dee655d9c623baac95db1eba Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 13 Nov 2013 07:46:45 +0200 Subject: Drop support for Xerces-C++ 2-series --- examples/cxx/tree/embedded/driver.cxx | 40 +--------------------- .../cxx/tree/embedded/grammar-input-stream.cxx | 19 ---------- .../cxx/tree/embedded/grammar-input-stream.hxx | 12 ------- examples/cxx/tree/embedded/xsdbin.cxx | 20 +++-------- 4 files changed, 5 insertions(+), 86 deletions(-) (limited to 'examples/cxx/tree/embedded') diff --git a/examples/cxx/tree/embedded/driver.cxx b/examples/cxx/tree/embedded/driver.cxx index 6e31d3b..2ccf469 100644 --- a/examples/cxx/tree/embedded/driver.cxx +++ b/examples/cxx/tree/embedded/driver.cxx @@ -12,11 +12,7 @@ #include // xercesc::Grammar #include -#if _XERCES_VERSION >= 30000 -# include -#else -# include -#endif +#include #include #include @@ -86,10 +82,6 @@ main (int argc, char* argv[]) DOMImplementation* impl ( DOMImplementationRegistry::getDOMImplementation (ls_id)); -#if _XERCES_VERSION >= 30000 - - // Xerces-C++ 3.0.0 and later. - // xml::dom::auto_ptr parser ( impl->createLSParser ( DOMImplementationLS::MODE_SYNCHRONOUS, 0, mm, gp.get ())); @@ -150,32 +142,6 @@ main (int argc, char* argv[]) xml::dom::bits::error_handler_proxy ehp (eh); conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp); -#else // _XERCES_VERSION >= 30000 - - // Same as above but for Xerces-C++ 2 series. - // - xml::dom::auto_ptr parser ( - impl->createDOMBuilder( - DOMImplementationLS::MODE_SYNCHRONOUS, 0, mm, gp.get ())); - - - parser->setFeature (XMLUni::fgDOMComments, false); - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - parser->setFeature (XMLUni::fgDOMEntities, false); - parser->setFeature (XMLUni::fgDOMNamespaces, true); - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - parser->setFeature (XMLUni::fgDOMValidation, true); - parser->setFeature (XMLUni::fgXercesSchema, true); - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, false); - parser->setFeature (XMLUni::fgXercesUseCachedGrammarInParse, true); - parser->setFeature (XMLUni::fgXercesUserAdoptsDOMDocument, true); - - tree::error_handler eh; - xml::dom::bits::error_handler_proxy ehp (eh); - parser->setErrorHandler (&ehp); - -#endif // _XERCES_VERSION >= 30000 - // Parse XML documents. // for (unsigned long i (0); i < 10; ++i) @@ -191,11 +157,7 @@ main (int argc, char* argv[]) // Parse XML to DOM. // -#if _XERCES_VERSION >= 30000 xml_schema::dom::auto_ptr doc (parser->parse (&wrap)); -#else - xml_schema::dom::auto_ptr doc (parser->parse (wrap)); -#endif eh.throw_if_failed (); diff --git a/examples/cxx/tree/embedded/grammar-input-stream.cxx b/examples/cxx/tree/embedded/grammar-input-stream.cxx index 0c94ea6..270f1d9 100644 --- a/examples/cxx/tree/embedded/grammar-input-stream.cxx +++ b/examples/cxx/tree/embedded/grammar-input-stream.cxx @@ -16,27 +16,14 @@ grammar_input_stream (const XMLByte* data, std::size_t size) { } -#if _XERCES_VERSION >= 30000 XMLFilePos grammar_input_stream:: curPos () const { return static_cast (vpos_); } -#else -unsigned int grammar_input_stream:: -curPos () const -{ - return static_cast (vpos_); -} -#endif -#if _XERCES_VERSION >= 30000 XMLSize_t grammar_input_stream:: readBytes (XMLByte* const buf, const XMLSize_t size) -#else -unsigned int grammar_input_stream:: -readBytes (XMLByte* const buf, const unsigned int size) -#endif { std::size_t i (0); @@ -99,17 +86,11 @@ readBytes (XMLByte* const buf, const unsigned int size) vpos_ += i; -#if _XERCES_VERSION >= 30000 return static_cast (i); -#else - return static_cast (i); -#endif } -#if _XERCES_VERSION >= 30000 const XMLCh* grammar_input_stream:: getContentType () const { return 0; } -#endif diff --git a/examples/cxx/tree/embedded/grammar-input-stream.hxx b/examples/cxx/tree/embedded/grammar-input-stream.hxx index a1b73c6..5a861ef 100644 --- a/examples/cxx/tree/embedded/grammar-input-stream.hxx +++ b/examples/cxx/tree/embedded/grammar-input-stream.hxx @@ -16,8 +16,6 @@ class grammar_input_stream: public xercesc::BinInputStream public : grammar_input_stream (const XMLByte* data, std::size_t size); -#if _XERCES_VERSION >= 30000 - virtual XMLFilePos curPos () const; @@ -27,16 +25,6 @@ public : virtual const XMLCh* getContentType () const; -#else - - virtual unsigned int - curPos () const; - - virtual unsigned int - readBytes (XMLByte* const buf, const unsigned int size); - -#endif - private : const XMLByte* data_; std::size_t size_; diff --git a/examples/cxx/tree/embedded/xsdbin.cxx b/examples/cxx/tree/embedded/xsdbin.cxx index 0da307b..dc42fd6 100644 --- a/examples/cxx/tree/embedded/xsdbin.cxx +++ b/examples/cxx/tree/embedded/xsdbin.cxx @@ -28,11 +28,7 @@ #include #include -#if _XERCES_VERSION >= 30000 -# include -#else -# include -#endif +#include using namespace std; using namespace xercesc; @@ -490,17 +486,9 @@ handle (const SAXParseException& e, severity s) char* id (XMLString::transcode (xid)); char* msg (XMLString::transcode (e.getMessage ())); - cerr << id << ":"; - -#if _XERCES_VERSION >= 30000 - cerr << e.getLineNumber () << ":" << e.getColumnNumber () << " "; -#else - XMLSSize_t l (e.getLineNumber ()); - XMLSSize_t c (e.getColumnNumber ()); - cerr << (l == -1 ? 0 : l) << ":" << (c == -1 ? 0 : c) << " "; -#endif - - cerr << (s == s_warning ? "warning: " : "error: ") << msg << endl; + cerr << id << ":" + << e.getLineNumber () << ":" << e.getColumnNumber () << " " + << (s == s_warning ? "warning: " : "error: ") << msg << endl; XMLString::release (&id); XMLString::release (&msg); -- cgit v1.1