From 9878dfe26a08ea5638c562c22c9becd11d462015 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 5 Nov 2009 06:49:41 +0200 Subject: Enable multiple import support for Xerces-C++ 3.1.0 or later --- examples/cxx/tree/caching/driver.cxx | 9 ++++++++- examples/cxx/tree/custom/comments/dom-parse.cxx | 7 +++++++ examples/cxx/tree/messaging/dom-parse.cxx | 7 +++++++ examples/cxx/tree/multiroot/dom-parse.cxx | 7 +++++++ examples/cxx/tree/performance/parsing.cxx | 7 +++++++ examples/cxx/tree/streaming/parser.cxx | 7 +++++++ examples/cxx/tree/xpath/dom-parse.cxx | 7 +++++++ 7 files changed, 50 insertions(+), 1 deletion(-) (limited to 'examples/cxx/tree') diff --git a/examples/cxx/tree/caching/driver.cxx b/examples/cxx/tree/caching/driver.cxx index 5c3405a..015606f 100644 --- a/examples/cxx/tree/caching/driver.cxx +++ b/examples/cxx/tree/caching/driver.cxx @@ -84,12 +84,19 @@ main (int argc, char* argv[]) // conf->setParameter (XMLUni::fgDOMElementContentWhitespace, false); - // Enable/Disable validation. + // Enable validation. // conf->setParameter (XMLUni::fgDOMValidate, true); conf->setParameter (XMLUni::fgXercesSchema, true); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // Set error handler. // tree::error_handler eh; diff --git a/examples/cxx/tree/custom/comments/dom-parse.cxx b/examples/cxx/tree/custom/comments/dom-parse.cxx index 7ad6aa5..1ba62e5 100644 --- a/examples/cxx/tree/custom/comments/dom-parse.cxx +++ b/examples/cxx/tree/custom/comments/dom-parse.cxx @@ -68,6 +68,13 @@ parse (std::istream& is, const std::string& id, bool validate) conf->setParameter (XMLUni::fgXercesSchema, validate); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // We will release the DOM document ourselves. // conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true); diff --git a/examples/cxx/tree/messaging/dom-parse.cxx b/examples/cxx/tree/messaging/dom-parse.cxx index d6ce204..e4bc6cc 100644 --- a/examples/cxx/tree/messaging/dom-parse.cxx +++ b/examples/cxx/tree/messaging/dom-parse.cxx @@ -68,6 +68,13 @@ parse (std::istream& is, const std::string& id, bool validate) conf->setParameter (XMLUni::fgXercesSchema, validate); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // We will release the DOM document ourselves. // conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true); diff --git a/examples/cxx/tree/multiroot/dom-parse.cxx b/examples/cxx/tree/multiroot/dom-parse.cxx index 3a67626..2b57be0 100644 --- a/examples/cxx/tree/multiroot/dom-parse.cxx +++ b/examples/cxx/tree/multiroot/dom-parse.cxx @@ -68,6 +68,13 @@ parse (std::istream& is, const std::string& id, bool validate) conf->setParameter (XMLUni::fgXercesSchema, validate); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // We will release the DOM document ourselves. // conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true); diff --git a/examples/cxx/tree/performance/parsing.cxx b/examples/cxx/tree/performance/parsing.cxx index fd27fb2..3997ea6 100644 --- a/examples/cxx/tree/performance/parsing.cxx +++ b/examples/cxx/tree/performance/parsing.cxx @@ -90,6 +90,13 @@ parsing (const char* file, unsigned long iter, bool validate) conf->setParameter (XMLUni::fgXercesSchema, true); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // If we are validating, pre-load and cache the schema. // parser->loadGrammar ("test.xsd", Grammar::SchemaGrammarType, true); diff --git a/examples/cxx/tree/streaming/parser.cxx b/examples/cxx/tree/streaming/parser.cxx index 1a0fa73..77fc6cc 100644 --- a/examples/cxx/tree/streaming/parser.cxx +++ b/examples/cxx/tree/streaming/parser.cxx @@ -99,6 +99,13 @@ parser_impl () parser_->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true); parser_->setFeature (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + parser_->setFeature (XMLUni::fgXercesHandleMultipleImports, true); +#endif + parser_->setErrorHandler (&error_proxy_); parser_->setContentHandler (this); } diff --git a/examples/cxx/tree/xpath/dom-parse.cxx b/examples/cxx/tree/xpath/dom-parse.cxx index 84ff0af..82e87b6 100644 --- a/examples/cxx/tree/xpath/dom-parse.cxx +++ b/examples/cxx/tree/xpath/dom-parse.cxx @@ -63,6 +63,13 @@ parse (std::istream& is, conf->setParameter (XMLUni::fgXercesSchema, validate); conf->setParameter (XMLUni::fgXercesSchemaFullChecking, false); + // Xerces-C++ 3.1.0 is the first version with working multi import + // support. + // +#if _XERCES_VERSION >= 30100 + conf->setParameter (XMLUni::fgXercesHandleMultipleImports, true); +#endif + // We will release the DOM document ourselves. // conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true); -- cgit v1.1