From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:25:44 +0200 Subject: Imported Upstream version 4.0.0 --- xsd/examples/cxx/tree/multiroot/balance.xml | 1 - xsd/examples/cxx/tree/multiroot/deposit.xml | 1 - xsd/examples/cxx/tree/multiroot/dom-parse.cxx | 32 --------------------------- xsd/examples/cxx/tree/multiroot/dom-parse.hxx | 1 - xsd/examples/cxx/tree/multiroot/driver.cxx | 1 - xsd/examples/cxx/tree/multiroot/makefile | 11 +++++---- xsd/examples/cxx/tree/multiroot/protocol.xsd | 1 - xsd/examples/cxx/tree/multiroot/withdraw.xml | 1 - 8 files changed, 5 insertions(+), 44 deletions(-) (limited to 'xsd/examples/cxx/tree/multiroot') diff --git a/xsd/examples/cxx/tree/multiroot/balance.xml b/xsd/examples/cxx/tree/multiroot/balance.xml index 055546a..68b434a 100644 --- a/xsd/examples/cxx/tree/multiroot/balance.xml +++ b/xsd/examples/cxx/tree/multiroot/balance.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/multiroot/deposit.xml b/xsd/examples/cxx/tree/multiroot/deposit.xml index 3207eee..4d9449a 100644 --- a/xsd/examples/cxx/tree/multiroot/deposit.xml +++ b/xsd/examples/cxx/tree/multiroot/deposit.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/multiroot/dom-parse.cxx b/xsd/examples/cxx/tree/multiroot/dom-parse.cxx index 2b57be0..98fc82e 100644 --- a/xsd/examples/cxx/tree/multiroot/dom-parse.cxx +++ b/xsd/examples/cxx/tree/multiroot/dom-parse.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/multiroot/dom-parse.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include "dom-parse.hxx" @@ -30,10 +29,6 @@ parse (std::istream& is, const std::string& id, bool validate) 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)); @@ -85,39 +80,12 @@ parse (std::istream& is, const std::string& id, bool validate) 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)); - - 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, validate); - parser->setFeature (XMLUni::fgXercesSchema, validate); - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, false); - parser->setFeature (XMLUni::fgXercesUserAdoptsDOMDocument, true); - - tree::error_handler eh; - xml::dom::bits::error_handler_proxy ehp (eh); - parser->setErrorHandler (&ehp); - -#endif // _XERCES_VERSION >= 30000 - // Prepare input stream. // xml::sax::std_input_source isrc (is, id); Wrapper4InputSource wrap (&isrc, false); -#if _XERCES_VERSION >= 30000 xml::dom::auto_ptr doc (parser->parse (&wrap)); -#else - xml::dom::auto_ptr doc (parser->parse (wrap)); -#endif eh.throw_if_failed > (); diff --git a/xsd/examples/cxx/tree/multiroot/dom-parse.hxx b/xsd/examples/cxx/tree/multiroot/dom-parse.hxx index c3bbf71..c2ab0fb 100644 --- a/xsd/examples/cxx/tree/multiroot/dom-parse.hxx +++ b/xsd/examples/cxx/tree/multiroot/dom-parse.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/multiroot/dom-parse.hxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #ifndef DOM_PARSE diff --git a/xsd/examples/cxx/tree/multiroot/driver.cxx b/xsd/examples/cxx/tree/multiroot/driver.cxx index cd5be34..9497ef1 100644 --- a/xsd/examples/cxx/tree/multiroot/driver.cxx +++ b/xsd/examples/cxx/tree/multiroot/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/multiroot/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/multiroot/makefile b/xsd/examples/cxx/tree/multiroot/makefile index ea31976..4d6c907 100644 --- a/xsd/examples/cxx/tree/multiroot/makefile +++ b/xsd/examples/cxx/tree/multiroot/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/multiroot/makefile -# author : Boris Kolpackov -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make @@ -29,17 +28,17 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --root-element-all +$(gen): xsd_options += --root-element-all $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -76,7 +75,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. # diff --git a/xsd/examples/cxx/tree/multiroot/protocol.xsd b/xsd/examples/cxx/tree/multiroot/protocol.xsd index 28e8478..1121824 100644 --- a/xsd/examples/cxx/tree/multiroot/protocol.xsd +++ b/xsd/examples/cxx/tree/multiroot/protocol.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/multiroot/withdraw.xml b/xsd/examples/cxx/tree/multiroot/withdraw.xml index 4df736f..8f1dc54 100644 --- a/xsd/examples/cxx/tree/multiroot/withdraw.xml +++ b/xsd/examples/cxx/tree/multiroot/withdraw.xml @@ -3,7 +3,6 @@ -- cgit v1.2.3