diff options
Diffstat (limited to 'libxsd/xsd')
178 files changed, 314 insertions, 256 deletions
diff --git a/libxsd/xsd/buildfile b/libxsd/xsd/buildfile new file mode 100644 index 0000000..ef0d0c5 --- /dev/null +++ b/libxsd/xsd/buildfile @@ -0,0 +1,39 @@ +# file : xsd/buildfile +# license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +# Note that libxsd includes headers of some third-party libraries (Xerces-C++, +# Expat, ACE) and APIs (XDR) into some of its headers. We consider +# functionality provided by these headers as optional and assume that libxsd +# dependents that require such functionality will handle the respective +# dependencies (in buildfiles, manifests, etc) themselves. An alternative would +# be to split libxsd into the hierarchy of libraries, but it doesn't feel very +# practical at the moment. +# +lib{xsd}: cxx/{hxx ixx txx}{** -version} cxx/hxx{version} + +# Include the generated version header into the distribution (so that we don't +# pick up an installed one) and don't remove it when cleaning in src (so that +# clean results in a state identical to distributed). +# +cxx/ +{ + hxx{version}: in{version} $src_root/manifest + hxx{version}: + { + dist = true + clean = ($src_root != $out_root) + } +} + +# Export options. +# +lib{xsd}: cxx.export.poptions = "-I$out_root" "-I$src_root" + +# Install into the xsd/ subdirectory of, say, /usr/include/ recreating +# subdirectories. +# +{hxx ixx txx}{*}: +{ + install = include/xsd/ + install.subdirs = true +} diff --git a/libxsd/xsd/cxx/auto-array.hxx b/libxsd/xsd/cxx/auto-array.hxx index 684a1b7..670c1aa 100644 --- a/libxsd/xsd/cxx/auto-array.hxx +++ b/libxsd/xsd/cxx/auto-array.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/auto-array.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_AUTO_ARRAY_HXX diff --git a/libxsd/xsd/cxx/compilers/vc-8/post.hxx b/libxsd/xsd/cxx/compilers/vc-8/post.hxx index eb26fa2..2b2f145 100644 --- a/libxsd/xsd/cxx/compilers/vc-8/post.hxx +++ b/libxsd/xsd/cxx/compilers/vc-8/post.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/compilers/vc-8/post.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #pragma warning (pop) diff --git a/libxsd/xsd/cxx/compilers/vc-8/pre.hxx b/libxsd/xsd/cxx/compilers/vc-8/pre.hxx index 47a3306..ddaac01 100644 --- a/libxsd/xsd/cxx/compilers/vc-8/pre.hxx +++ b/libxsd/xsd/cxx/compilers/vc-8/pre.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/compilers/vc-8/pre.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file // These warnings had to be disabled "for good". diff --git a/libxsd/xsd/cxx/config.hxx b/libxsd/xsd/cxx/config.hxx index 9b511a4..1cd3101 100644 --- a/libxsd/xsd/cxx/config.hxx +++ b/libxsd/xsd/cxx/config.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/config.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_CONFIG_HXX diff --git a/libxsd/xsd/cxx/exceptions.hxx b/libxsd/xsd/cxx/exceptions.hxx index 34ec78b..6852e1a 100644 --- a/libxsd/xsd/cxx/exceptions.hxx +++ b/libxsd/xsd/cxx/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/document.hxx b/libxsd/xsd/cxx/parser/document.hxx index c493edc..7c136c0 100644 --- a/libxsd/xsd/cxx/parser/document.hxx +++ b/libxsd/xsd/cxx/parser/document.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/document.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_DOCUMENT_HXX diff --git a/libxsd/xsd/cxx/parser/document.txx b/libxsd/xsd/cxx/parser/document.txx index aa2b75c..cee73b1 100644 --- a/libxsd/xsd/cxx/parser/document.txx +++ b/libxsd/xsd/cxx/parser/document.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/document.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/elements.hxx b/libxsd/xsd/cxx/parser/elements.hxx index c116f68..baf180f 100644 --- a/libxsd/xsd/cxx/parser/elements.hxx +++ b/libxsd/xsd/cxx/parser/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/parser/elements.txx b/libxsd/xsd/cxx/parser/elements.txx index c85a2ba..aa0b979 100644 --- a/libxsd/xsd/cxx/parser/elements.txx +++ b/libxsd/xsd/cxx/parser/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/error-handler.hxx b/libxsd/xsd/cxx/parser/error-handler.hxx index 794eede..b0a04ff 100644 --- a/libxsd/xsd/cxx/parser/error-handler.hxx +++ b/libxsd/xsd/cxx/parser/error-handler.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/error-handler.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_ERROR_HANDLER_HXX diff --git a/libxsd/xsd/cxx/parser/error-handler.txx b/libxsd/xsd/cxx/parser/error-handler.txx index 00756d1..5d3e50f 100644 --- a/libxsd/xsd/cxx/parser/error-handler.txx +++ b/libxsd/xsd/cxx/parser/error-handler.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/error-handler.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/exceptions.hxx b/libxsd/xsd/cxx/parser/exceptions.hxx index 0df9584..acb613f 100644 --- a/libxsd/xsd/cxx/parser/exceptions.hxx +++ b/libxsd/xsd/cxx/parser/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/exceptions.ixx b/libxsd/xsd/cxx/parser/exceptions.ixx index 27b62e5..08859b1 100644 --- a/libxsd/xsd/cxx/parser/exceptions.ixx +++ b/libxsd/xsd/cxx/parser/exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/exceptions.txx b/libxsd/xsd/cxx/parser/exceptions.txx index 1d32a03..5d94f95 100644 --- a/libxsd/xsd/cxx/parser/exceptions.txx +++ b/libxsd/xsd/cxx/parser/exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/expat/elements.hxx b/libxsd/xsd/cxx/parser/expat/elements.hxx index 284be5c..bd0b84c 100644 --- a/libxsd/xsd/cxx/parser/expat/elements.hxx +++ b/libxsd/xsd/cxx/parser/expat/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/expat/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_EXPAT_ELEMENTS_HXX @@ -87,6 +86,12 @@ namespace xsd return parser_; } + void + reset (XML_Parser parser) + { + *this = parser; + } + private: parser_auto_ptr (const parser_auto_ptr&); diff --git a/libxsd/xsd/cxx/parser/expat/elements.txx b/libxsd/xsd/cxx/parser/expat/elements.txx index 11ea281..803c53c 100644 --- a/libxsd/xsd/cxx/parser/expat/elements.txx +++ b/libxsd/xsd/cxx/parser/expat/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/expat/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <new> // std::bad_alloc @@ -313,7 +312,7 @@ namespace xsd if (XML_Parse (parser.get (), buf, - is.gcount (), + static_cast<int> (is.gcount ()), is.eof ()) == XML_STATUS_ERROR) { r = false; @@ -338,7 +337,8 @@ namespace xsd // if (auto_xml_parser_.get () == 0) { - auto_xml_parser_ = XML_ParserCreateNS (0, XML_Char (' ')); + auto_xml_parser_.reset ( + XML_ParserCreateNS (0, XML_Char (' '))); if (auto_xml_parser_.get () == 0) throw std::bad_alloc (); diff --git a/libxsd/xsd/cxx/parser/map.hxx b/libxsd/xsd/cxx/parser/map.hxx index f0abd7e..3394c40 100644 --- a/libxsd/xsd/cxx/parser/map.hxx +++ b/libxsd/xsd/cxx/parser/map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/map.ixx b/libxsd/xsd/cxx/parser/map.ixx index 8e48696..c885be0 100644 --- a/libxsd/xsd/cxx/parser/map.ixx +++ b/libxsd/xsd/cxx/parser/map.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/map.txx b/libxsd/xsd/cxx/parser/map.txx index ca55230..3c1433e 100644 --- a/libxsd/xsd/cxx/parser/map.txx +++ b/libxsd/xsd/cxx/parser/map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.hxx b/libxsd/xsd/cxx/parser/non-validating/parser.hxx index 754c4ac..79b11d9 100644 --- a/libxsd/xsd/cxx/parser/non-validating/parser.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/parser.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/parser.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_PARSER_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/parser.txx b/libxsd/xsd/cxx/parser/non-validating/parser.txx index 95c4e11..eed2756 100644 --- a/libxsd/xsd/cxx/parser/non-validating/parser.txx +++ b/libxsd/xsd/cxx/parser/non-validating/parser.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/parser.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx index 14111a3..0ce04cc 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_XML_SCHEMA_PIMPL_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx index 5f295d2..6082654 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx index 6e695a9..9f56f7f 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pimpl.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pimpl.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <limits> diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx index 54acbbe..cac9d27 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_NON_VALIDATING_XML_SCHEMA_PSKEL_HXX diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx index 19d35d6..e6db6cb 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx index 37ea650..fb166d0 100644 --- a/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx +++ b/libxsd/xsd/cxx/parser/non-validating/xml-schema-pskel.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/non-validating/xml-schema-pskel.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.hxx b/libxsd/xsd/cxx/parser/schema-exceptions.hxx index f6bfdd4..6145167 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.hxx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_SCHEMA_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.ixx b/libxsd/xsd/cxx/parser/schema-exceptions.ixx index e13b1d1..fdf0e99 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.ixx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/schema-exceptions.txx b/libxsd/xsd/cxx/parser/schema-exceptions.txx index 0ae5a08..2e548ab 100644 --- a/libxsd/xsd/cxx/parser/schema-exceptions.txx +++ b/libxsd/xsd/cxx/parser/schema-exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/schema-exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/substitution-map.hxx b/libxsd/xsd/cxx/parser/substitution-map.hxx index bb9c3f8..07619b7 100644 --- a/libxsd/xsd/cxx/parser/substitution-map.hxx +++ b/libxsd/xsd/cxx/parser/substitution-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/substitution-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_SUBSTITUTION_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/substitution-map.txx b/libxsd/xsd/cxx/parser/substitution-map.txx index a9a7627..5e9e92d 100644 --- a/libxsd/xsd/cxx/parser/substitution-map.txx +++ b/libxsd/xsd/cxx/parser/substitution-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/substitution-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.hxx b/libxsd/xsd/cxx/parser/validating/exceptions.hxx index 111376d..2201a8b 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.hxx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.ixx b/libxsd/xsd/cxx/parser/validating/exceptions.ixx index 1cb67b5..f46dcd1 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.ixx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/exceptions.txx b/libxsd/xsd/cxx/parser/validating/exceptions.txx index 2a5016b..f6b39e8 100644 --- a/libxsd/xsd/cxx/parser/validating/exceptions.txx +++ b/libxsd/xsd/cxx/parser/validating/exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx b/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx index 5a8ce50..1b338ec 100644 --- a/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx +++ b/libxsd/xsd/cxx/parser/validating/inheritance-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/inheritance-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_INHERITANCE_MAP_HXX diff --git a/libxsd/xsd/cxx/parser/validating/inheritance-map.txx b/libxsd/xsd/cxx/parser/validating/inheritance-map.txx index 2490c07..f141d9e 100644 --- a/libxsd/xsd/cxx/parser/validating/inheritance-map.txx +++ b/libxsd/xsd/cxx/parser/validating/inheritance-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/inheritance-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/validating/parser.hxx b/libxsd/xsd/cxx/parser/validating/parser.hxx index f3738b7..4ababce 100644 --- a/libxsd/xsd/cxx/parser/validating/parser.hxx +++ b/libxsd/xsd/cxx/parser/validating/parser.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/parser.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_PARSER_HXX diff --git a/libxsd/xsd/cxx/parser/validating/parser.txx b/libxsd/xsd/cxx/parser/validating/parser.txx index 5cda58e..fa1d1c4 100644 --- a/libxsd/xsd/cxx/parser/validating/parser.txx +++ b/libxsd/xsd/cxx/parser/validating/parser.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/parser.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cassert> diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx index 67cf4cf..5f9133a 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_XML_SCHEMA_PIMPL_HXX diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx index fcfcf07..5875b57 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx index 1624f8c..7bf2523 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pimpl.txx @@ -1,11 +1,11 @@ // file : xsd/cxx/parser/validating/xml-schema-pimpl.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <limits> #include <locale> #ifdef XSD_CXX11 +# include <cmath> // std::isfinite # include <utility> // std::move #endif @@ -717,9 +717,13 @@ namespace xsd zc_istream<C> is (str); is.imbue (std::locale::classic ()); - //@@ TODO: now we accept scientific notations and INF/NaN. + // Note that std::isfinite() returns false for INF/NaN. // +#ifdef XSD_CXX11 + if (!(is >> value_ && std::isfinite (value_) && is.exhausted ())) +#else if (!(is >> value_ && is.exhausted ())) +#endif throw invalid_value<C> (bits::decimal<C> (), str); } diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx index d7ff8b9..1ad6528 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_VALIDATING_XML_SCHEMA_PSKEL_HXX diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx index 11b9fcd..7133a6c 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #if defined(XSD_CXX_PARSER_USE_CHAR) || !defined(XSD_CXX_PARSER_USE_WCHAR) diff --git a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx index d92ebf8..eb2fe0d 100644 --- a/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx +++ b/libxsd/xsd/cxx/parser/validating/xml-schema-pskel.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/validating/xml-schema-pskel.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/parser/xerces/elements.hxx b/libxsd/xsd/cxx/parser/xerces/elements.hxx index 8a9c8a2..292b689 100644 --- a/libxsd/xsd/cxx/parser/xerces/elements.hxx +++ b/libxsd/xsd/cxx/parser/xerces/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xerces/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_XERCES_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/parser/xerces/elements.txx b/libxsd/xsd/cxx/parser/xerces/elements.txx index 6831609..a0a808f 100644 --- a/libxsd/xsd/cxx/parser/xerces/elements.txx +++ b/libxsd/xsd/cxx/parser/xerces/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xerces/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <istream> diff --git a/libxsd/xsd/cxx/parser/xml-schema.hxx b/libxsd/xsd/cxx/parser/xml-schema.hxx index 916ccd1..be6c46e 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.hxx +++ b/libxsd/xsd/cxx/parser/xml-schema.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_PARSER_XML_SCHEMA_HXX diff --git a/libxsd/xsd/cxx/parser/xml-schema.ixx b/libxsd/xsd/cxx/parser/xml-schema.ixx index d25bdb7..1989384 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.ixx +++ b/libxsd/xsd/cxx/parser/xml-schema.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <new> // operator new/delete diff --git a/libxsd/xsd/cxx/parser/xml-schema.txx b/libxsd/xsd/cxx/parser/xml-schema.txx index b55bc9f..7ace2d7 100644 --- a/libxsd/xsd/cxx/parser/xml-schema.txx +++ b/libxsd/xsd/cxx/parser/xml-schema.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/parser/xml-schema.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/post.hxx b/libxsd/xsd/cxx/post.hxx index f0a3ebe..6df09cc 100644 --- a/libxsd/xsd/cxx/post.hxx +++ b/libxsd/xsd/cxx/post.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/post.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifdef _MSC_VER diff --git a/libxsd/xsd/cxx/pre.hxx b/libxsd/xsd/cxx/pre.hxx index 07a2ecb..800e1ad 100644 --- a/libxsd/xsd/cxx/pre.hxx +++ b/libxsd/xsd/cxx/pre.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/pre.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifdef _MSC_VER diff --git a/libxsd/xsd/cxx/ro-string.hxx b/libxsd/xsd/cxx/ro-string.hxx index 2db7aa6..87b1b5f 100644 --- a/libxsd/xsd/cxx/ro-string.hxx +++ b/libxsd/xsd/cxx/ro-string.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/ro-string.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_RO_STRING_HXX diff --git a/libxsd/xsd/cxx/ro-string.txx b/libxsd/xsd/cxx/ro-string.txx index 1685a46..5e13b58 100644 --- a/libxsd/xsd/cxx/ro-string.txx +++ b/libxsd/xsd/cxx/ro-string.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/ro-string.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/ace-cdr-stream-common.hxx b/libxsd/xsd/cxx/tree/ace-cdr-stream-common.hxx index 28d93d2..25f4791 100644 --- a/libxsd/xsd/cxx/tree/ace-cdr-stream-common.hxx +++ b/libxsd/xsd/cxx/tree/ace-cdr-stream-common.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/ace-cdr-stream-common.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ACE_CDR_STREAM_COMMON_HXX diff --git a/libxsd/xsd/cxx/tree/ace-cdr-stream-extraction.hxx b/libxsd/xsd/cxx/tree/ace-cdr-stream-extraction.hxx index 50dabf2..3da39d2 100644 --- a/libxsd/xsd/cxx/tree/ace-cdr-stream-extraction.hxx +++ b/libxsd/xsd/cxx/tree/ace-cdr-stream-extraction.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/ace-cdr-stream-extraction.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ACE_CDR_STREAM_EXTRACTION_HXX diff --git a/libxsd/xsd/cxx/tree/ace-cdr-stream-insertion.hxx b/libxsd/xsd/cxx/tree/ace-cdr-stream-insertion.hxx index c88b5b3..40b1c4c 100644 --- a/libxsd/xsd/cxx/tree/ace-cdr-stream-insertion.hxx +++ b/libxsd/xsd/cxx/tree/ace-cdr-stream-insertion.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/ace-cdr-stream-insertion.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ACE_CDR_STREAM_INSERTION_HXX diff --git a/libxsd/xsd/cxx/tree/bits/literals.hxx b/libxsd/xsd/cxx/tree/bits/literals.hxx index 3dfb1ab..e15830c 100644 --- a/libxsd/xsd/cxx/tree/bits/literals.hxx +++ b/libxsd/xsd/cxx/tree/bits/literals.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/bits/literals.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_BITS_LITERALS_HXX diff --git a/libxsd/xsd/cxx/tree/bits/literals.ixx b/libxsd/xsd/cxx/tree/bits/literals.ixx index d24c64f..e55657d 100644 --- a/libxsd/xsd/cxx/tree/bits/literals.ixx +++ b/libxsd/xsd/cxx/tree/bits/literals.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/bits/literals.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_BITS_LITERALS_IXX diff --git a/libxsd/xsd/cxx/tree/buffer.hxx b/libxsd/xsd/cxx/tree/buffer.hxx index e6ad8ce..b455c33 100644 --- a/libxsd/xsd/cxx/tree/buffer.hxx +++ b/libxsd/xsd/cxx/tree/buffer.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/buffer.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file /** diff --git a/libxsd/xsd/cxx/tree/buffer.txx b/libxsd/xsd/cxx/tree/buffer.txx index fe0d49d..0ad8ecd 100644 --- a/libxsd/xsd/cxx/tree/buffer.txx +++ b/libxsd/xsd/cxx/tree/buffer.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/buffer.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/comparison-map.hxx b/libxsd/xsd/cxx/tree/comparison-map.hxx index 897caba..d78cc90 100644 --- a/libxsd/xsd/cxx/tree/comparison-map.hxx +++ b/libxsd/xsd/cxx/tree/comparison-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/comparison-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_COMPARISON_MAP_HXX diff --git a/libxsd/xsd/cxx/tree/comparison-map.txx b/libxsd/xsd/cxx/tree/comparison-map.txx index 0ab63ef..cc739b3 100644 --- a/libxsd/xsd/cxx/tree/comparison-map.txx +++ b/libxsd/xsd/cxx/tree/comparison-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/comparison-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/tree/types.hxx> diff --git a/libxsd/xsd/cxx/tree/containers-wildcard.hxx b/libxsd/xsd/cxx/tree/containers-wildcard.hxx index 40b5a69..7fc5dce 100644 --- a/libxsd/xsd/cxx/tree/containers-wildcard.hxx +++ b/libxsd/xsd/cxx/tree/containers-wildcard.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/containers-wildcard.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_CONTAINERS_WILDCARD_HXX diff --git a/libxsd/xsd/cxx/tree/containers.hxx b/libxsd/xsd/cxx/tree/containers.hxx index 1eb14ae..3e26ca3 100644 --- a/libxsd/xsd/cxx/tree/containers.hxx +++ b/libxsd/xsd/cxx/tree/containers.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/containers.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_CONTAINERS_HXX @@ -859,6 +858,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + sequence& + operator= (const sequence&) = default; +#endif + public: void assign (size_type n, const T& x) @@ -1091,7 +1095,7 @@ namespace xsd } // Note that the container object of the two sequences being - // swapped should be the same. + // swapped should be the same. // void swap (sequence& x) @@ -1133,6 +1137,11 @@ namespace xsd : base_sequence (s) { } + +#ifdef XSD_CXX11 + sequence& + operator= (const sequence&) = default; +#endif }; diff --git a/libxsd/xsd/cxx/tree/containers.txx b/libxsd/xsd/cxx/tree/containers.txx index 9af001f..11f52a1 100644 --- a/libxsd/xsd/cxx/tree/containers.txx +++ b/libxsd/xsd/cxx/tree/containers.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/containers.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <ostream> diff --git a/libxsd/xsd/cxx/tree/date-time-extraction.txx b/libxsd/xsd/cxx/tree/date-time-extraction.txx index e331a8e..c23c953 100644 --- a/libxsd/xsd/cxx/tree/date-time-extraction.txx +++ b/libxsd/xsd/cxx/tree/date-time-extraction.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time-extraction.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/date-time-insertion.txx b/libxsd/xsd/cxx/tree/date-time-insertion.txx index 91245ab..3a54cf8 100644 --- a/libxsd/xsd/cxx/tree/date-time-insertion.txx +++ b/libxsd/xsd/cxx/tree/date-time-insertion.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time-insertion.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/date-time-ostream.txx b/libxsd/xsd/cxx/tree/date-time-ostream.txx index f79a9be..e1f1763 100644 --- a/libxsd/xsd/cxx/tree/date-time-ostream.txx +++ b/libxsd/xsd/cxx/tree/date-time-ostream.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time-ostream.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <ostream> diff --git a/libxsd/xsd/cxx/tree/date-time.hxx b/libxsd/xsd/cxx/tree/date-time.hxx index 858e6b2..d5d06ec 100644 --- a/libxsd/xsd/cxx/tree/date-time.hxx +++ b/libxsd/xsd/cxx/tree/date-time.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file /** @@ -211,6 +210,11 @@ namespace xsd */ gday (const gday& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + gday& + operator= (const gday&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -372,6 +376,11 @@ namespace xsd */ gmonth (const gmonth& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + gmonth& + operator= (const gmonth&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -533,6 +542,11 @@ namespace xsd */ gyear (const gyear& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + gyear& + operator= (const gyear&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -697,6 +711,11 @@ namespace xsd */ gmonth_day (const gmonth_day& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + gmonth_day& + operator= (const gmonth_day&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -881,6 +900,11 @@ namespace xsd */ gyear_month (const gyear_month& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + gyear_month& + operator= (const gyear_month&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -1069,6 +1093,11 @@ namespace xsd */ date (const date& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + date& + operator= (const date&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -1270,6 +1299,11 @@ namespace xsd */ time (const time& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + time& + operator= (const time&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -1494,6 +1528,11 @@ namespace xsd virtual date_time* _clone (flags f = 0, container* c = 0) const; +#ifdef XSD_CXX11 + date_time& + operator= (const date_time&) = default; +#endif + /** * @brief Create an instance from a data representation * stream. @@ -1724,6 +1763,11 @@ namespace xsd */ duration (const duration& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + duration& + operator= (const duration&) = default; +#endif + /** * @brief Copy the instance polymorphically. * diff --git a/libxsd/xsd/cxx/tree/date-time.ixx b/libxsd/xsd/cxx/tree/date-time.ixx index 59834be..b34ceab 100644 --- a/libxsd/xsd/cxx/tree/date-time.ixx +++ b/libxsd/xsd/cxx/tree/date-time.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/date-time.txx b/libxsd/xsd/cxx/tree/date-time.txx index a363a3d..dfa1ac7 100644 --- a/libxsd/xsd/cxx/tree/date-time.txx +++ b/libxsd/xsd/cxx/tree/date-time.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/date-time.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/element-map.hxx b/libxsd/xsd/cxx/tree/element-map.hxx index 11aa53a..d42f569 100644 --- a/libxsd/xsd/cxx/tree/element-map.hxx +++ b/libxsd/xsd/cxx/tree/element-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/element-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ELEMENT_MAP_HXX diff --git a/libxsd/xsd/cxx/tree/element-map.txx b/libxsd/xsd/cxx/tree/element-map.txx index b19a94d..1eb5d9d 100644 --- a/libxsd/xsd/cxx/tree/element-map.txx +++ b/libxsd/xsd/cxx/tree/element-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/element-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/elements.hxx b/libxsd/xsd/cxx/tree/elements.hxx index 919804d..cff1ada 100644 --- a/libxsd/xsd/cxx/tree/elements.hxx +++ b/libxsd/xsd/cxx/tree/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file /** @@ -236,6 +235,8 @@ namespace xsd std::size_t index; }; + //@cond + bool operator== (const content_order&, const content_order&); @@ -245,8 +246,6 @@ namespace xsd bool operator< (const content_order&, const content_order&); - //@cond - // DOM user data keys. // template <int dummy> @@ -459,7 +458,9 @@ namespace xsd // anyType content API. // public: + //@cond typedef element_optional dom_content_optional; + //@endcond /** * @brief Return a read-only (constant) reference to the anyType @@ -1199,10 +1200,10 @@ namespace xsd dom_content_optional dom; }; - //@endcond - mutable XSD_AUTO_PTR<content_type> content_; + //@endcond + private: container* container_; }; @@ -1253,6 +1254,11 @@ namespace xsd */ simple_type (const simple_type& x, flags f = 0, container* c = 0); +#ifdef XSD_CXX11 + simple_type& + operator= (const simple_type&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -1616,6 +1622,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + fundamental_base& + operator= (const fundamental_base&) = default; +#endif + /** * @brief Copy the instance polymorphically. * diff --git a/libxsd/xsd/cxx/tree/elements.ixx b/libxsd/xsd/cxx/tree/elements.ixx index 2c160b3..6e758e4 100644 --- a/libxsd/xsd/cxx/tree/elements.ixx +++ b/libxsd/xsd/cxx/tree/elements.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/elements.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/elements.txx b/libxsd/xsd/cxx/tree/elements.txx index 1c5bd54..f57e3c8 100644 --- a/libxsd/xsd/cxx/tree/elements.txx +++ b/libxsd/xsd/cxx/tree/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/util/XMLUniDefs.hpp> diff --git a/libxsd/xsd/cxx/tree/error-handler.hxx b/libxsd/xsd/cxx/tree/error-handler.hxx index 28db9db..35cd85c 100644 --- a/libxsd/xsd/cxx/tree/error-handler.hxx +++ b/libxsd/xsd/cxx/tree/error-handler.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/error-handler.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ERROR_HANDLER_HXX diff --git a/libxsd/xsd/cxx/tree/error-handler.txx b/libxsd/xsd/cxx/tree/error-handler.txx index fa0fdcb..5fde8b7 100644 --- a/libxsd/xsd/cxx/tree/error-handler.txx +++ b/libxsd/xsd/cxx/tree/error-handler.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/error-handler.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/tree/exceptions.hxx b/libxsd/xsd/cxx/tree/exceptions.hxx index 76e7d25..928652f 100644 --- a/libxsd/xsd/cxx/tree/exceptions.hxx +++ b/libxsd/xsd/cxx/tree/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file /** diff --git a/libxsd/xsd/cxx/tree/exceptions.txx b/libxsd/xsd/cxx/tree/exceptions.txx index 796c94a..2ff645e 100644 --- a/libxsd/xsd/cxx/tree/exceptions.txx +++ b/libxsd/xsd/cxx/tree/exceptions.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/exceptions.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/tree/bits/literals.hxx> diff --git a/libxsd/xsd/cxx/tree/facet.hxx b/libxsd/xsd/cxx/tree/facet.hxx index f2452da..d0a5d8c 100644 --- a/libxsd/xsd/cxx/tree/facet.hxx +++ b/libxsd/xsd/cxx/tree/facet.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/facet.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_FACET_HXX diff --git a/libxsd/xsd/cxx/tree/istream-fwd.hxx b/libxsd/xsd/cxx/tree/istream-fwd.hxx index c27150c..801b89d 100644 --- a/libxsd/xsd/cxx/tree/istream-fwd.hxx +++ b/libxsd/xsd/cxx/tree/istream-fwd.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/istream-fwd.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ISTREAM_FWD_HXX diff --git a/libxsd/xsd/cxx/tree/istream.hxx b/libxsd/xsd/cxx/tree/istream.hxx index 0a8bc3b..c50a122 100644 --- a/libxsd/xsd/cxx/tree/istream.hxx +++ b/libxsd/xsd/cxx/tree/istream.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/istream.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ISTREAM_HXX diff --git a/libxsd/xsd/cxx/tree/iterator-adapter.hxx b/libxsd/xsd/cxx/tree/iterator-adapter.hxx index 5b47421..d1f5d51 100644 --- a/libxsd/xsd/cxx/tree/iterator-adapter.hxx +++ b/libxsd/xsd/cxx/tree/iterator-adapter.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/iterator-adapter.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_ITERATOR_ADAPTER_HXX diff --git a/libxsd/xsd/cxx/tree/list.hxx b/libxsd/xsd/cxx/tree/list.hxx index ea04aca..c44c882 100644 --- a/libxsd/xsd/cxx/tree/list.hxx +++ b/libxsd/xsd/cxx/tree/list.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/list.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_LIST_HXX @@ -63,6 +62,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + list& + operator= (const list&) = default; +#endif + public: list (const xercesc::DOMElement&, flags = 0, container* c = 0); @@ -113,6 +117,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + list& + operator= (const list&) = default; +#endif + public: list (const xercesc::DOMElement&, flags = 0, container* c = 0); diff --git a/libxsd/xsd/cxx/tree/ostream.hxx b/libxsd/xsd/cxx/tree/ostream.hxx index 7919670..179dba0 100644 --- a/libxsd/xsd/cxx/tree/ostream.hxx +++ b/libxsd/xsd/cxx/tree/ostream.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/ostream.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_OSTREAM_HXX diff --git a/libxsd/xsd/cxx/tree/parsing.hxx b/libxsd/xsd/cxx/tree/parsing.hxx index cfd9445..388e364 100644 --- a/libxsd/xsd/cxx/tree/parsing.hxx +++ b/libxsd/xsd/cxx/tree/parsing.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_HXX diff --git a/libxsd/xsd/cxx/tree/parsing.txx b/libxsd/xsd/cxx/tree/parsing.txx index ca7b5e5..6dd2fc1 100644 --- a/libxsd/xsd/cxx/tree/parsing.txx +++ b/libxsd/xsd/cxx/tree/parsing.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <string> diff --git a/libxsd/xsd/cxx/tree/parsing/boolean.hxx b/libxsd/xsd/cxx/tree/parsing/boolean.hxx index 3bf2a8a..64cf5bf 100644 --- a/libxsd/xsd/cxx/tree/parsing/boolean.hxx +++ b/libxsd/xsd/cxx/tree/parsing/boolean.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/boolean.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_BOOLEAN_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/byte.hxx b/libxsd/xsd/cxx/tree/parsing/byte.hxx index d4a6be7..8fc4d8f 100644 --- a/libxsd/xsd/cxx/tree/parsing/byte.hxx +++ b/libxsd/xsd/cxx/tree/parsing/byte.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/byte.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_BYTE_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/date-time.txx b/libxsd/xsd/cxx/tree/parsing/date-time.txx index 4be8d32..04f8f48 100644 --- a/libxsd/xsd/cxx/tree/parsing/date-time.txx +++ b/libxsd/xsd/cxx/tree/parsing/date-time.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/date-time.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/ro-string.hxx> diff --git a/libxsd/xsd/cxx/tree/parsing/decimal.hxx b/libxsd/xsd/cxx/tree/parsing/decimal.hxx index eb42c70..07128f9 100644 --- a/libxsd/xsd/cxx/tree/parsing/decimal.hxx +++ b/libxsd/xsd/cxx/tree/parsing/decimal.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/decimal.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_DECIMAL_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/double.hxx b/libxsd/xsd/cxx/tree/parsing/double.hxx index ac1914d..7e1a7cc 100644 --- a/libxsd/xsd/cxx/tree/parsing/double.hxx +++ b/libxsd/xsd/cxx/tree/parsing/double.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/double.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_DOUBLE_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/element-map.txx b/libxsd/xsd/cxx/tree/parsing/element-map.txx index a585eb0..a6b1e31 100644 --- a/libxsd/xsd/cxx/tree/parsing/element-map.txx +++ b/libxsd/xsd/cxx/tree/parsing/element-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/element-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_ELEMENT_MAP_TXX diff --git a/libxsd/xsd/cxx/tree/parsing/float.hxx b/libxsd/xsd/cxx/tree/parsing/float.hxx index d6da733..bbeab2c 100644 --- a/libxsd/xsd/cxx/tree/parsing/float.hxx +++ b/libxsd/xsd/cxx/tree/parsing/float.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/float.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_FLOAT_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/int.hxx b/libxsd/xsd/cxx/tree/parsing/int.hxx index d19097c..566edef 100644 --- a/libxsd/xsd/cxx/tree/parsing/int.hxx +++ b/libxsd/xsd/cxx/tree/parsing/int.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/int.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_INT_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/long.hxx b/libxsd/xsd/cxx/tree/parsing/long.hxx index 65107e3..97b81d6 100644 --- a/libxsd/xsd/cxx/tree/parsing/long.hxx +++ b/libxsd/xsd/cxx/tree/parsing/long.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/long.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_LONG_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/short.hxx b/libxsd/xsd/cxx/tree/parsing/short.hxx index 3698c49..8b97f80 100644 --- a/libxsd/xsd/cxx/tree/parsing/short.hxx +++ b/libxsd/xsd/cxx/tree/parsing/short.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/short.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_SHORT_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx index e8bd4d4..6a8b606 100644 --- a/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx +++ b/libxsd/xsd/cxx/tree/parsing/unsigned-byte.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/unsigned-byte.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_BYTE_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx index 1cea998..c9f1f64 100644 --- a/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx +++ b/libxsd/xsd/cxx/tree/parsing/unsigned-int.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/unsigned-int.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_INT_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx index e3c0322..4c77484 100644 --- a/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx +++ b/libxsd/xsd/cxx/tree/parsing/unsigned-long.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/unsigned-long.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_LONG_HXX diff --git a/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx b/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx index 9ef1a42..5491bcd 100644 --- a/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx +++ b/libxsd/xsd/cxx/tree/parsing/unsigned-short.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/parsing/unsigned-short.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_PARSING_UNSIGNED_SHORT_HXX diff --git a/libxsd/xsd/cxx/tree/serialization.hxx b/libxsd/xsd/cxx/tree/serialization.hxx index 04d1d07..3d8a193 100644 --- a/libxsd/xsd/cxx/tree/serialization.hxx +++ b/libxsd/xsd/cxx/tree/serialization.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_HXX diff --git a/libxsd/xsd/cxx/tree/serialization.txx b/libxsd/xsd/cxx/tree/serialization.txx index 297fe98..07c2d4d 100644 --- a/libxsd/xsd/cxx/tree/serialization.txx +++ b/libxsd/xsd/cxx/tree/serialization.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <string> diff --git a/libxsd/xsd/cxx/tree/serialization/boolean.hxx b/libxsd/xsd/cxx/tree/serialization/boolean.hxx index 85c8dfa..bd53f73 100644 --- a/libxsd/xsd/cxx/tree/serialization/boolean.hxx +++ b/libxsd/xsd/cxx/tree/serialization/boolean.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/boolean.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_BOOLEAN_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/byte.hxx b/libxsd/xsd/cxx/tree/serialization/byte.hxx index cf2d41b..f0e121e 100644 --- a/libxsd/xsd/cxx/tree/serialization/byte.hxx +++ b/libxsd/xsd/cxx/tree/serialization/byte.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/byte.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_BYTE_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/date-time.txx b/libxsd/xsd/cxx/tree/serialization/date-time.txx index a2c8bf6..fe305a4 100644 --- a/libxsd/xsd/cxx/tree/serialization/date-time.txx +++ b/libxsd/xsd/cxx/tree/serialization/date-time.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/date-time.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <locale> diff --git a/libxsd/xsd/cxx/tree/serialization/decimal.hxx b/libxsd/xsd/cxx/tree/serialization/decimal.hxx index 557b3f8..adfd167 100644 --- a/libxsd/xsd/cxx/tree/serialization/decimal.hxx +++ b/libxsd/xsd/cxx/tree/serialization/decimal.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/decimal.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_DECIMAL_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/double.hxx b/libxsd/xsd/cxx/tree/serialization/double.hxx index 18c1f23..1375836 100644 --- a/libxsd/xsd/cxx/tree/serialization/double.hxx +++ b/libxsd/xsd/cxx/tree/serialization/double.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/double.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_DOUBLE_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/element-map.txx b/libxsd/xsd/cxx/tree/serialization/element-map.txx index 46c1948..a4c199e 100644 --- a/libxsd/xsd/cxx/tree/serialization/element-map.txx +++ b/libxsd/xsd/cxx/tree/serialization/element-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/element-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_ELEMENT_MAP_TXX diff --git a/libxsd/xsd/cxx/tree/serialization/float.hxx b/libxsd/xsd/cxx/tree/serialization/float.hxx index 83045a6..ef935a3 100644 --- a/libxsd/xsd/cxx/tree/serialization/float.hxx +++ b/libxsd/xsd/cxx/tree/serialization/float.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/float.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_FLOAT_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/int.hxx b/libxsd/xsd/cxx/tree/serialization/int.hxx index 32cab7d..a01c11a 100644 --- a/libxsd/xsd/cxx/tree/serialization/int.hxx +++ b/libxsd/xsd/cxx/tree/serialization/int.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/int.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_INT_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/long.hxx b/libxsd/xsd/cxx/tree/serialization/long.hxx index 84c1f76..5978e55 100644 --- a/libxsd/xsd/cxx/tree/serialization/long.hxx +++ b/libxsd/xsd/cxx/tree/serialization/long.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/long.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_LONG_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/short.hxx b/libxsd/xsd/cxx/tree/serialization/short.hxx index 6e083a7..d10f047 100644 --- a/libxsd/xsd/cxx/tree/serialization/short.hxx +++ b/libxsd/xsd/cxx/tree/serialization/short.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/short.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_SHORT_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/unsigned-byte.hxx b/libxsd/xsd/cxx/tree/serialization/unsigned-byte.hxx index c0116ab..889a0de 100644 --- a/libxsd/xsd/cxx/tree/serialization/unsigned-byte.hxx +++ b/libxsd/xsd/cxx/tree/serialization/unsigned-byte.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/unsigned-byte.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_UNSIGNED_BYTE_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/unsigned-int.hxx b/libxsd/xsd/cxx/tree/serialization/unsigned-int.hxx index 2c6b709..eb34a1d 100644 --- a/libxsd/xsd/cxx/tree/serialization/unsigned-int.hxx +++ b/libxsd/xsd/cxx/tree/serialization/unsigned-int.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/unsigned-int.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_UNSIGNED_INT_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/unsigned-long.hxx b/libxsd/xsd/cxx/tree/serialization/unsigned-long.hxx index e8345c8..2c857da 100644 --- a/libxsd/xsd/cxx/tree/serialization/unsigned-long.hxx +++ b/libxsd/xsd/cxx/tree/serialization/unsigned-long.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/unsigned-long.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_UNSIGNED_LONG_HXX diff --git a/libxsd/xsd/cxx/tree/serialization/unsigned-short.hxx b/libxsd/xsd/cxx/tree/serialization/unsigned-short.hxx index 0a63b74..15dc743 100644 --- a/libxsd/xsd/cxx/tree/serialization/unsigned-short.hxx +++ b/libxsd/xsd/cxx/tree/serialization/unsigned-short.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/serialization/unsigned-short.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_SERIALIZATION_UNSIGNED_SHORT_HXX diff --git a/libxsd/xsd/cxx/tree/std-ostream-map.hxx b/libxsd/xsd/cxx/tree/std-ostream-map.hxx index 83d3f4b..87d2621 100644 --- a/libxsd/xsd/cxx/tree/std-ostream-map.hxx +++ b/libxsd/xsd/cxx/tree/std-ostream-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/std-ostream-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STD_OSTREAM_MAP_HXX diff --git a/libxsd/xsd/cxx/tree/std-ostream-map.txx b/libxsd/xsd/cxx/tree/std-ostream-map.txx index 171f2d1..a8cfa32 100644 --- a/libxsd/xsd/cxx/tree/std-ostream-map.txx +++ b/libxsd/xsd/cxx/tree/std-ostream-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/std-ostream-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/tree/types.hxx> diff --git a/libxsd/xsd/cxx/tree/std-ostream-operators.hxx b/libxsd/xsd/cxx/tree/std-ostream-operators.hxx index cd5a9bd..620f23a 100644 --- a/libxsd/xsd/cxx/tree/std-ostream-operators.hxx +++ b/libxsd/xsd/cxx/tree/std-ostream-operators.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/std-ostream-operators.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STD_OSTREAM_OPERATORS_HXX diff --git a/libxsd/xsd/cxx/tree/stream-extraction-map.hxx b/libxsd/xsd/cxx/tree/stream-extraction-map.hxx index 9b5493b..698f432 100644 --- a/libxsd/xsd/cxx/tree/stream-extraction-map.hxx +++ b/libxsd/xsd/cxx/tree/stream-extraction-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-extraction-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STREAM_EXTRACTION_MAP_HXX diff --git a/libxsd/xsd/cxx/tree/stream-extraction-map.txx b/libxsd/xsd/cxx/tree/stream-extraction-map.txx index e990d64..55950d3 100644 --- a/libxsd/xsd/cxx/tree/stream-extraction-map.txx +++ b/libxsd/xsd/cxx/tree/stream-extraction-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-extraction-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/tree/types.hxx> diff --git a/libxsd/xsd/cxx/tree/stream-extraction.hxx b/libxsd/xsd/cxx/tree/stream-extraction.hxx index 6d79fca..ff909d8 100644 --- a/libxsd/xsd/cxx/tree/stream-extraction.hxx +++ b/libxsd/xsd/cxx/tree/stream-extraction.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-extraction.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STREAM_EXTRACTION_HXX diff --git a/libxsd/xsd/cxx/tree/stream-insertion-map.hxx b/libxsd/xsd/cxx/tree/stream-insertion-map.hxx index 47f26cf..86c02f3 100644 --- a/libxsd/xsd/cxx/tree/stream-insertion-map.hxx +++ b/libxsd/xsd/cxx/tree/stream-insertion-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-insertion-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STREAM_INSERTION_MAP_HXX diff --git a/libxsd/xsd/cxx/tree/stream-insertion-map.txx b/libxsd/xsd/cxx/tree/stream-insertion-map.txx index 36eec23..3fb4b6a 100644 --- a/libxsd/xsd/cxx/tree/stream-insertion-map.txx +++ b/libxsd/xsd/cxx/tree/stream-insertion-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-insertion-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/tree/types.hxx> diff --git a/libxsd/xsd/cxx/tree/stream-insertion.hxx b/libxsd/xsd/cxx/tree/stream-insertion.hxx index 5a24fa9..a199f4f 100644 --- a/libxsd/xsd/cxx/tree/stream-insertion.hxx +++ b/libxsd/xsd/cxx/tree/stream-insertion.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/stream-insertion.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_STREAM_INSERTION_HXX diff --git a/libxsd/xsd/cxx/tree/text.hxx b/libxsd/xsd/cxx/tree/text.hxx index 473b0a6..7a37332 100644 --- a/libxsd/xsd/cxx/tree/text.hxx +++ b/libxsd/xsd/cxx/tree/text.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/text.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_TEXT_HXX diff --git a/libxsd/xsd/cxx/tree/text.txx b/libxsd/xsd/cxx/tree/text.txx index 1a6ad11..89b783a 100644 --- a/libxsd/xsd/cxx/tree/text.txx +++ b/libxsd/xsd/cxx/tree/text.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/text.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/dom/DOMText.hpp> diff --git a/libxsd/xsd/cxx/tree/type-factory-map.hxx b/libxsd/xsd/cxx/tree/type-factory-map.hxx index 767969d..d52982f 100644 --- a/libxsd/xsd/cxx/tree/type-factory-map.hxx +++ b/libxsd/xsd/cxx/tree/type-factory-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/type-factory-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_TYPE_FACTORY_MAP_HXX @@ -151,11 +150,14 @@ namespace xsd // // - template<unsigned long id, typename C, typename T> + template<unsigned long id, typename C> struct element_factory_initializer { + typedef typename type_factory_map<C>::factory factory; + element_factory_initializer (const C* root_name, const C* root_ns, - const C* subst_name, const C* subst_ns); + const C* subst_name, const C* subst_ns, + factory); ~element_factory_initializer (); diff --git a/libxsd/xsd/cxx/tree/type-factory-map.txx b/libxsd/xsd/cxx/tree/type-factory-map.txx index 7bcc61c..5a9dc38 100644 --- a/libxsd/xsd/cxx/tree/type-factory-map.txx +++ b/libxsd/xsd/cxx/tree/type-factory-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/type-factory-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/validators/schema/SchemaSymbols.hpp> @@ -303,6 +302,9 @@ namespace xsd if (i != element_map_.end ()) { + // Note that we may find an abstract element in which case the + // returned factory will be NULL. + // f = find_substitution (i->second, qn); } } @@ -456,21 +458,22 @@ namespace xsd // // - template<unsigned long id, typename C, typename T> - element_factory_initializer<id, C, T>:: + template<unsigned long id, typename C> + element_factory_initializer<id, C>:: element_factory_initializer (const C* root_name, const C* root_ns, - const C* subst_name, const C* subst_ns) + const C* subst_name, const C* subst_ns, + factory f) : root_name_ (root_name), root_ns_ (root_ns), subst_name_ (subst_name), subst_ns_ (subst_ns) { type_factory_map_instance<id, C> ().register_element ( xml::qualified_name<C> (root_name, root_ns), xml::qualified_name<C> (subst_name, subst_ns), - &factory_impl<T>); + f); } - template<unsigned long id, typename C, typename T> - element_factory_initializer<id, C, T>:: + template<unsigned long id, typename C> + element_factory_initializer<id, C>:: ~element_factory_initializer () { type_factory_map_instance<id, C> ().unregister_element ( diff --git a/libxsd/xsd/cxx/tree/type-serializer-map.hxx b/libxsd/xsd/cxx/tree/type-serializer-map.hxx index 485654c..50869b5 100644 --- a/libxsd/xsd/cxx/tree/type-serializer-map.hxx +++ b/libxsd/xsd/cxx/tree/type-serializer-map.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/type-serializer-map.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_TYPE_SERIALIZER_MAP_HXX @@ -217,8 +216,11 @@ namespace xsd template<unsigned long id, typename C, typename T> struct element_serializer_initializer { + typedef typename type_serializer_map<C>::serializer serializer; + element_serializer_initializer (const C* root_name, const C* root_ns, - const C* subst_name, const C* subst_ns); + const C* subst_name, const C* subst_ns, + serializer); ~element_serializer_initializer (); diff --git a/libxsd/xsd/cxx/tree/type-serializer-map.txx b/libxsd/xsd/cxx/tree/type-serializer-map.txx index 6a41570..a6c690a 100644 --- a/libxsd/xsd/cxx/tree/type-serializer-map.txx +++ b/libxsd/xsd/cxx/tree/type-serializer-map.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/type-serializer-map.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/util/XMLUni.hpp> @@ -551,14 +550,21 @@ namespace xsd template<unsigned long id, typename C, typename T> element_serializer_initializer<id, C, T>:: element_serializer_initializer (const C* root_name, const C* root_ns, - const C* subst_name, const C* subst_ns) + const C* subst_name, const C* subst_ns, + serializer s) : root_name_ (root_name), root_ns_ (root_ns) { + // Note that we still have to use real typeid (instead of, say, NULL) + // for abstract elements to make sure we have separate entries for + // each of them. We can assume that such a typeid can never be looked + // up (since it's impossible to instantiate the corresponding abstract + // type). + // type_serializer_map_instance<id, C> ().register_element ( xml::qualified_name<C> (root_name, root_ns), xml::qualified_name<C> (subst_name, subst_ns), typeid (T), - &serializer_impl<T>); + s); } template<unsigned long id, typename C, typename T> diff --git a/libxsd/xsd/cxx/tree/types.hxx b/libxsd/xsd/cxx/tree/types.hxx index fec4151..0790997 100644 --- a/libxsd/xsd/cxx/tree/types.hxx +++ b/libxsd/xsd/cxx/tree/types.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/types.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file /** @@ -269,6 +268,18 @@ namespace xsd base () = x; return *this; } + + public: + /** + * @brief Explicitly "cast" to the base string type. + * + * @return A const reference to the instance as the base string type. + */ + const std::basic_string<C>& + base_string () const + { + return *this; + } }; /** @@ -1079,6 +1090,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + nmtokens& + operator= (const nmtokens&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -2560,6 +2576,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + idrefs& + operator= (const idrefs&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -2868,6 +2889,18 @@ namespace xsd return *this; } + public: + /** + * @brief Explicitly "cast" to the base string type. + * + * @return A const reference to the instance as the base string type. + */ + const std::basic_string<C>& + base_string () const + { + return *this; + } + protected: //@cond @@ -2968,6 +3001,11 @@ namespace xsd // } +#ifdef XSD_CXX11 + qname& + operator= (const qname&) = default; +#endif + /** * @brief Copy the instance polymorphically. * @@ -3124,7 +3162,9 @@ namespace xsd class base64_binary: public B, public buffer<C> { public: + //@cond typedef typename buffer<C>::size_t size_t; + //@endcond public: /** @@ -3343,7 +3383,9 @@ namespace xsd class hex_binary: public B, public buffer<C> { public: + //@cond typedef typename buffer<C>::size_t size_t; + //@endcond public: /** @@ -3846,6 +3888,11 @@ namespace xsd { } +#ifdef XSD_CXX11 + entities& + operator= (const entities&) = default; +#endif + /** * @brief Copy the instance polymorphically. * diff --git a/libxsd/xsd/cxx/tree/types.txx b/libxsd/xsd/cxx/tree/types.txx index cb5f8b1..c2a461c 100644 --- a/libxsd/xsd/cxx/tree/types.txx +++ b/libxsd/xsd/cxx/tree/types.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/types.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/util/Base64.hpp> diff --git a/libxsd/xsd/cxx/tree/xdr-stream-common.hxx b/libxsd/xsd/cxx/tree/xdr-stream-common.hxx index d687c3c..7db4223 100644 --- a/libxsd/xsd/cxx/tree/xdr-stream-common.hxx +++ b/libxsd/xsd/cxx/tree/xdr-stream-common.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/xdr-stream-common.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_XDR_STREAM_COMMON_HXX diff --git a/libxsd/xsd/cxx/tree/xdr-stream-extraction.hxx b/libxsd/xsd/cxx/tree/xdr-stream-extraction.hxx index a77b7f3..044e93a 100644 --- a/libxsd/xsd/cxx/tree/xdr-stream-extraction.hxx +++ b/libxsd/xsd/cxx/tree/xdr-stream-extraction.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/xdr-stream-extraction.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_XDR_STREAM_EXTRACTION_HXX diff --git a/libxsd/xsd/cxx/tree/xdr-stream-insertion.hxx b/libxsd/xsd/cxx/tree/xdr-stream-insertion.hxx index 672faf5..b834f8e 100644 --- a/libxsd/xsd/cxx/tree/xdr-stream-insertion.hxx +++ b/libxsd/xsd/cxx/tree/xdr-stream-insertion.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/tree/xdr-stream-insertion.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_TREE_XDR_STREAM_INSERTION_HXX diff --git a/libxsd/xsd/cxx/version.hxx b/libxsd/xsd/cxx/version.hxx index 267ecee..e69de29 100644 --- a/libxsd/xsd/cxx/version.hxx +++ b/libxsd/xsd/cxx/version.hxx @@ -1,28 +0,0 @@ -// file : xsd/cxx/version.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC -// license : GNU GPL v2 + exceptions; see accompanying LICENSE file - -#ifndef XSD_CXX_VERSION_HXX -#define XSD_CXX_VERSION_HXX - -// Version format is AABBCCDD where -// -// AA - major version number -// BB - minor version number -// CC - bugfix version number -// DD - alpha / beta (DD + 50) version number -// -// When DD is not 00, 1 is subtracted from AABBCC. For example: -// -// Version AABBCCDD -// 2.0.0 02000000 -// 2.1.0 02010000 -// 2.1.1 02010100 -// 2.2.0.a1 02019901 -// 3.0.0.b2 02999952 -// - -#define XSD_STR_VERSION "4.1.0.a11" -#define XSD_INT_VERSION 4009911L - -#endif // XSD_CXX_VERSION_HXX diff --git a/libxsd/xsd/cxx/version.hxx.in b/libxsd/xsd/cxx/version.hxx.in new file mode 100644 index 0000000..7f2e17a --- /dev/null +++ b/libxsd/xsd/cxx/version.hxx.in @@ -0,0 +1,43 @@ +// file : xsd/cxx/version.hxx.in +// license : GNU GPL v2 + exceptions; see accompanying LICENSE file + +#ifndef LIBXSD_VERSION // Note: using the version macro itself. + +// The numeric version format is AAAAABBBBBCCCCCDDDE where: +// +// AAAAA - major version number +// BBBBB - minor version number +// CCCCC - bugfix version number +// DDD - alpha / beta (DDD + 500) version number +// E - final (0) / snapshot (1) +// +// When DDDE is not 0, 1 is subtracted from AAAAABBBBBCCCCC. For example: +// +// Version AAAAABBBBBCCCCCDDDE +// +// 0.1.0 0000000001000000000 +// 0.1.2 0000000001000020000 +// 1.2.3 0000100002000030000 +// 2.2.0-a.1 0000200001999990010 +// 3.0.0-b.2 0000299999999995020 +// 2.2.0-a.1.z 0000200001999990011 +// +#define LIBXSD_VERSION $libxsd.version.project_number$ULL +#define LIBXSD_VERSION_STR "$libxsd.version.project$" +#define LIBXSD_VERSION_ID "$libxsd.version.project_id$" +#define LIBXSD_VERSION_FULL "$libxsd.version$" + +#define LIBXSD_VERSION_MAJOR $libxsd.version.major$ +#define LIBXSD_VERSION_MINOR $libxsd.version.minor$ +#define LIBXSD_VERSION_PATCH $libxsd.version.patch$ + +#define LIBXSD_PRE_RELEASE $libxsd.version.pre_release$ + +#define LIBXSD_SNAPSHOT $libxsd.version.snapshot_sn$ULL +#define LIBXSD_SNAPSHOT_ID "$libxsd.version.snapshot_id$" + +// Note that Xerces and Expat compatibility is verified by the respective +// parsers (see parser/xerces/elements.hxx and parser/expat/elements.hxx for +// details). + +#endif // LIBXSD_VERSION diff --git a/libxsd/xsd/cxx/xml/bits/literals.hxx b/libxsd/xsd/cxx/xml/bits/literals.hxx index c0d1275..b80fa78 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.hxx +++ b/libxsd/xsd/cxx/xml/bits/literals.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/bits/literals.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_BITS_LITERALS_HXX diff --git a/libxsd/xsd/cxx/xml/bits/literals.ixx b/libxsd/xsd/cxx/xml/bits/literals.ixx index a811e61..36afd3c 100644 --- a/libxsd/xsd/cxx/xml/bits/literals.ixx +++ b/libxsd/xsd/cxx/xml/bits/literals.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/bits/literals.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_BITS_LITERALS_IXX diff --git a/libxsd/xsd/cxx/xml/char-iso8859-1.hxx b/libxsd/xsd/cxx/xml/char-iso8859-1.hxx index c57e201..5e87b3d 100644 --- a/libxsd/xsd/cxx/xml/char-iso8859-1.hxx +++ b/libxsd/xsd/cxx/xml/char-iso8859-1.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-iso8859-1.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_TRANSCODER diff --git a/libxsd/xsd/cxx/xml/char-iso8859-1.txx b/libxsd/xsd/cxx/xml/char-iso8859-1.txx index 7554811..8ad9f36 100644 --- a/libxsd/xsd/cxx/xml/char-iso8859-1.txx +++ b/libxsd/xsd/cxx/xml/char-iso8859-1.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-iso8859-1.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/config.hxx> // XSD_CXX11 diff --git a/libxsd/xsd/cxx/xml/char-lcp.hxx b/libxsd/xsd/cxx/xml/char-lcp.hxx index 34c1ecd..6958f3e 100644 --- a/libxsd/xsd/cxx/xml/char-lcp.hxx +++ b/libxsd/xsd/cxx/xml/char-lcp.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-lcp.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_TRANSCODER diff --git a/libxsd/xsd/cxx/xml/char-lcp.txx b/libxsd/xsd/cxx/xml/char-lcp.txx index 55fa085..efcd0d0 100644 --- a/libxsd/xsd/cxx/xml/char-lcp.txx +++ b/libxsd/xsd/cxx/xml/char-lcp.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-lcp.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <cstring> // std::memcpy diff --git a/libxsd/xsd/cxx/xml/char-utf8.hxx b/libxsd/xsd/cxx/xml/char-utf8.hxx index 872c80b..84186cd 100644 --- a/libxsd/xsd/cxx/xml/char-utf8.hxx +++ b/libxsd/xsd/cxx/xml/char-utf8.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-utf8.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_TRANSCODER diff --git a/libxsd/xsd/cxx/xml/char-utf8.txx b/libxsd/xsd/cxx/xml/char-utf8.txx index be66c57..76bba86 100644 --- a/libxsd/xsd/cxx/xml/char-utf8.txx +++ b/libxsd/xsd/cxx/xml/char-utf8.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/char-utf8.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/config.hxx> // XSD_CXX11 @@ -116,20 +115,24 @@ namespace xsd rs[i + 3] = C ((u | 0x80UL) & 0xBFUL); u >>= 6; } + // Fall through. case 3: { rs[i + 2] = C ((u | 0x80UL) & 0xBFUL); u >>= 6; } + // Fall through. case 2: { rs[i + 1] = C ((u | 0x80UL) & 0xBFUL); u >>= 6; } + // Fall through. case 1: { rs[i] = C (u | first_byte_mask_[count]); } + // Fall through. } i += count; @@ -217,7 +220,7 @@ namespace xsd // u = (c & 0x1F) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; @@ -232,7 +235,7 @@ namespace xsd // u = (c & 0x0F) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; @@ -240,7 +243,7 @@ namespace xsd } u = (u | (c & 0x3F)) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; @@ -255,7 +258,7 @@ namespace xsd // u = (c & 0x07) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; @@ -263,7 +266,7 @@ namespace xsd } u = (u | (c & 0x3F)) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; @@ -271,7 +274,7 @@ namespace xsd } u = (u | (c & 0x3F)) << 6; - c = *++p; + c = static_cast<unsigned char> (*++p); if ((c >> 6) != 2) { valid = false; diff --git a/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx b/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx index cf5bcb5..256f824 100644 --- a/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx +++ b/libxsd/xsd/cxx/xml/dom/auto-ptr.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/auto-ptr.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_AUTO_PTR_HXX @@ -54,8 +53,11 @@ namespace xsd unique_ptr (unique_ptr&& p): base (std::move (p)) {} template <class T1> unique_ptr (unique_ptr<T1>&& p): base (std::move (p)) {} + +#if !defined(__cplusplus) || __cplusplus < 201703L template <class T1> unique_ptr (std::auto_ptr<T1>&& p): base (std::move (p)) {} +#endif unique_ptr& operator= (unique_ptr&& p) { diff --git a/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx b/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx index 19af014..5154b62 100644 --- a/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx +++ b/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/bits/error-handler-proxy.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_BITS_ERROR_HANDLER_PROXY_HXX diff --git a/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.txx b/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.txx index 4dd76bb..a1f83ff 100644 --- a/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.txx +++ b/libxsd/xsd/cxx/xml/dom/bits/error-handler-proxy.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/bits/error-handler-proxy.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/xml/string.hxx> diff --git a/libxsd/xsd/cxx/xml/dom/elements.hxx b/libxsd/xsd/cxx/xml/dom/elements.hxx index bf1ffe2..1244395 100644 --- a/libxsd/xsd/cxx/xml/dom/elements.hxx +++ b/libxsd/xsd/cxx/xml/dom/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/xml/dom/elements.txx b/libxsd/xsd/cxx/xml/dom/elements.txx index 7d8cf67..46e4866 100644 --- a/libxsd/xsd/cxx/xml/dom/elements.txx +++ b/libxsd/xsd/cxx/xml/dom/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/xml/string.hxx> diff --git a/libxsd/xsd/cxx/xml/dom/parsing-header.hxx b/libxsd/xsd/cxx/xml/dom/parsing-header.hxx index 4f5dc20..b7bf344 100644 --- a/libxsd/xsd/cxx/xml/dom/parsing-header.hxx +++ b/libxsd/xsd/cxx/xml/dom/parsing-header.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/parsing-header.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_PARSING_HEADER_HXX diff --git a/libxsd/xsd/cxx/xml/dom/parsing-source.hxx b/libxsd/xsd/cxx/xml/dom/parsing-source.hxx index 69282e1..e4cb37e 100644 --- a/libxsd/xsd/cxx/xml/dom/parsing-source.hxx +++ b/libxsd/xsd/cxx/xml/dom/parsing-source.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/parsing-source.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_PARSING_SOURCE_HXX @@ -9,6 +8,7 @@ #include <xercesc/dom/DOMNode.hpp> #include <xercesc/dom/DOMAttr.hpp> +#include <xercesc/dom/DOMText.hpp> #include <xercesc/dom/DOMElement.hpp> #include <xercesc/dom/DOMDocument.hpp> #include <xercesc/dom/DOMNamedNodeMap.hpp> diff --git a/libxsd/xsd/cxx/xml/dom/parsing-source.txx b/libxsd/xsd/cxx/xml/dom/parsing-source.txx index 0bc8f00..2a2d6e2 100644 --- a/libxsd/xsd/cxx/xml/dom/parsing-source.txx +++ b/libxsd/xsd/cxx/xml/dom/parsing-source.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/parsing-source.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/dom/DOMLSParser.hpp> @@ -106,7 +105,10 @@ namespace xsd const properties<C>& prop, unsigned long flags) { - using namespace xercesc; + // Note: explicitly qualifying everything with xerces:: to avoid + // conflicts with MSXML. + // + using xercesc::XMLUni; // Instantiate the DOM parser. // @@ -116,13 +118,14 @@ namespace xsd // Get an implementation of the Load-Store (LS) interface. // - DOMImplementation* impl ( - DOMImplementationRegistry::getDOMImplementation (ls_id)); + xercesc::DOMImplementation* impl ( + xercesc::DOMImplementationRegistry::getDOMImplementation (ls_id)); - XSD_DOM_AUTO_PTR<DOMLSParser> parser ( - impl->createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0)); + XSD_DOM_AUTO_PTR<xercesc::DOMLSParser> parser ( + impl->createLSParser ( + xercesc::DOMImplementationLS::MODE_SYNCHRONOUS, 0)); - DOMConfiguration* conf (parser->getDomConfig ()); + xercesc::DOMConfiguration* conf (parser->getDomConfig ()); // Discard comment nodes in the document. // @@ -217,7 +220,7 @@ namespace xsd xercesc::Wrapper4InputSource wrap (&is, false); - XSD_DOM_AUTO_PTR<DOMDocument> doc; + XSD_DOM_AUTO_PTR<xercesc::DOMDocument> doc; try { doc.reset (parser->parse (&wrap)); @@ -250,7 +253,10 @@ namespace xsd const properties<C>& prop, unsigned long flags) { - using namespace xercesc; + // Note: explicitly qualifying everything with xerces:: to avoid + // conflicts with MSXML. + // + using xercesc::XMLUni; // Instantiate the DOM parser. // @@ -260,13 +266,14 @@ namespace xsd // Get an implementation of the Load-Store (LS) interface. // - DOMImplementation* impl ( - DOMImplementationRegistry::getDOMImplementation (ls_id)); + xercesc::DOMImplementation* impl ( + xercesc::DOMImplementationRegistry::getDOMImplementation (ls_id)); - XSD_DOM_AUTO_PTR<DOMLSParser> parser ( - impl->createLSParser(DOMImplementationLS::MODE_SYNCHRONOUS, 0)); + XSD_DOM_AUTO_PTR<xercesc::DOMLSParser> parser ( + impl->createLSParser( + xercesc::DOMImplementationLS::MODE_SYNCHRONOUS, 0)); - DOMConfiguration* conf (parser->getDomConfig ()); + xercesc::DOMConfiguration* conf (parser->getDomConfig ()); // Discard comment nodes in the document. // @@ -360,7 +367,7 @@ namespace xsd bits::error_handler_proxy<C> ehp (eh); conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp); - XSD_DOM_AUTO_PTR<DOMDocument> doc; + XSD_DOM_AUTO_PTR<xercesc::DOMDocument> doc; try { doc.reset (parser->parseURI (string (uri).c_str ())); diff --git a/libxsd/xsd/cxx/xml/dom/serialization-header.hxx b/libxsd/xsd/cxx/xml/dom/serialization-header.hxx index a4948aa..8d3d6e9 100644 --- a/libxsd/xsd/cxx/xml/dom/serialization-header.hxx +++ b/libxsd/xsd/cxx/xml/dom/serialization-header.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/serialization-header.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_SERIALIZATION_HEADER_HXX diff --git a/libxsd/xsd/cxx/xml/dom/serialization-header.txx b/libxsd/xsd/cxx/xml/dom/serialization-header.txx index a08d292..4b9ebdd 100644 --- a/libxsd/xsd/cxx/xml/dom/serialization-header.txx +++ b/libxsd/xsd/cxx/xml/dom/serialization-header.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/serialization-header.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <vector> @@ -175,7 +174,9 @@ namespace xsd atts.push_back (a); } - for (std::vector<DOMAttr*>::iterator i (atts.begin ()), + // Qualify DOMAttr to work around MSVC 16.11 /std:c++20 issue. + // + for (std::vector<xercesc::DOMAttr*>::iterator i (atts.begin ()), end (atts.end ()); i != end; ++i) { e.removeAttributeNode (*i); diff --git a/libxsd/xsd/cxx/xml/dom/serialization-source.hxx b/libxsd/xsd/cxx/xml/dom/serialization-source.hxx index 14c822c..a25e2ca 100644 --- a/libxsd/xsd/cxx/xml/dom/serialization-source.hxx +++ b/libxsd/xsd/cxx/xml/dom/serialization-source.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/serialization-source.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_SERIALIZATION_SOURCE_HXX diff --git a/libxsd/xsd/cxx/xml/dom/serialization-source.txx b/libxsd/xsd/cxx/xml/dom/serialization-source.txx index 177c066..e663d7b 100644 --- a/libxsd/xsd/cxx/xml/dom/serialization-source.txx +++ b/libxsd/xsd/cxx/xml/dom/serialization-source.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/serialization-source.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/util/XMLUni.hpp> // xercesc::fg* @@ -110,7 +109,10 @@ namespace xsd add_namespaces (xercesc::DOMElement& el, const namespace_infomap<C>& map) { - using namespace xercesc; + // Note: explicitly qualifying everything with xerces:: to avoid + // conflicts with MSXML. + // + using xercesc::XMLUni; typedef std::basic_string<C> string; typedef namespace_infomap<C> infomap; @@ -160,14 +162,14 @@ namespace xsd // if (!i->second.name.empty ()) el.setAttributeNS ( - xercesc::XMLUni::fgXMLNSURIName, + XMLUni::fgXMLNSURIName, xml::string (xmlns_prefix).c_str (), xml::string (i->second.name).c_str ()); } else { el.setAttributeNS ( - xercesc::XMLUni::fgXMLNSURIName, + XMLUni::fgXMLNSURIName, xml::string (xmlns_prefix + colon + i->first).c_str (), xml::string (i->second.name).c_str ()); } @@ -237,7 +239,8 @@ namespace xsd const namespace_infomap<C>& map, unsigned long) { - using namespace xercesc; + // Note: explicitly qualifying everything with xerces:: to avoid + // conflicts with MSXML. typedef std::basic_string<C> string; typedef namespace_infomap<C> infomap; @@ -269,10 +272,10 @@ namespace xsd xercesc::chLatin_S, xercesc::chNull}; - DOMImplementation* impl ( - DOMImplementationRegistry::getDOMImplementation (ls)); + xercesc::DOMImplementation* impl ( + xercesc::DOMImplementationRegistry::getDOMImplementation (ls)); - XSD_DOM_AUTO_PTR<DOMDocument> doc ( + XSD_DOM_AUTO_PTR<xercesc::DOMDocument> doc ( impl->createDocument ( (ns.empty () ? 0 : xml::string (ns).c_str ()), xml::string ((prefix.empty () @@ -294,21 +297,24 @@ namespace xsd xercesc::DOMErrorHandler& eh, unsigned long flags) { - using namespace xercesc; + // Note: explicitly qualifying everything with xerces:: to avoid + // conflicts with MSXML. + // + using xercesc::XMLUni; const XMLCh ls[] = {xercesc::chLatin_L, xercesc::chLatin_S, xercesc::chNull}; - DOMImplementation* impl ( - DOMImplementationRegistry::getDOMImplementation (ls)); + xercesc::DOMImplementation* impl ( + xercesc::DOMImplementationRegistry::getDOMImplementation (ls)); bits::error_handler_proxy<C> ehp (eh); - XSD_DOM_AUTO_PTR<DOMLSSerializer> writer ( + XSD_DOM_AUTO_PTR<xercesc::DOMLSSerializer> writer ( impl->createLSSerializer ()); - DOMConfiguration* conf (writer->getDomConfig ()); + xercesc::DOMConfiguration* conf (writer->getDomConfig ()); conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp); @@ -335,7 +341,7 @@ namespace xsd conf->canSetParameter (XMLUni::fgDOMXMLDeclaration, false)) conf->setParameter (XMLUni::fgDOMXMLDeclaration, false); - XSD_DOM_AUTO_PTR<DOMLSOutput> out (impl->createLSOutput ()); + XSD_DOM_AUTO_PTR<xercesc::DOMLSOutput> out (impl->createLSOutput ()); out->setEncoding (xml::string (encoding).c_str ()); out->setByteStream (&target); diff --git a/libxsd/xsd/cxx/xml/dom/wildcard-source.hxx b/libxsd/xsd/cxx/xml/dom/wildcard-source.hxx index 9c9c6a9..66c0ae6 100644 --- a/libxsd/xsd/cxx/xml/dom/wildcard-source.hxx +++ b/libxsd/xsd/cxx/xml/dom/wildcard-source.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/wildcard-source.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_DOM_WILDCARD_SOURCE_HXX diff --git a/libxsd/xsd/cxx/xml/dom/wildcard-source.txx b/libxsd/xsd/cxx/xml/dom/wildcard-source.txx index 0f6ccc9..5249235 100644 --- a/libxsd/xsd/cxx/xml/dom/wildcard-source.txx +++ b/libxsd/xsd/cxx/xml/dom/wildcard-source.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/dom/wildcard-source.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xercesc/util/XMLUniDefs.hpp> // chLatin_L, etc diff --git a/libxsd/xsd/cxx/xml/elements.hxx b/libxsd/xsd/cxx/xml/elements.hxx index 0870209..4145891 100644 --- a/libxsd/xsd/cxx/xml/elements.hxx +++ b/libxsd/xsd/cxx/xml/elements.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/elements.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_ELEMENTS_HXX diff --git a/libxsd/xsd/cxx/xml/elements.txx b/libxsd/xsd/cxx/xml/elements.txx index 0846148..c034c07 100644 --- a/libxsd/xsd/cxx/xml/elements.txx +++ b/libxsd/xsd/cxx/xml/elements.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/elements.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd diff --git a/libxsd/xsd/cxx/xml/error-handler.hxx b/libxsd/xsd/cxx/xml/error-handler.hxx index dcc048d..40c30f3 100644 --- a/libxsd/xsd/cxx/xml/error-handler.hxx +++ b/libxsd/xsd/cxx/xml/error-handler.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/error-handler.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_ERROR_HANDLER_HXX diff --git a/libxsd/xsd/cxx/xml/exceptions.hxx b/libxsd/xsd/cxx/xml/exceptions.hxx index 26f5a6d..2c2baaf 100644 --- a/libxsd/xsd/cxx/xml/exceptions.hxx +++ b/libxsd/xsd/cxx/xml/exceptions.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/exceptions.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_EXCEPTIONS_HXX diff --git a/libxsd/xsd/cxx/xml/qualified-name.hxx b/libxsd/xsd/cxx/xml/qualified-name.hxx index 69b0005..f6879aa 100644 --- a/libxsd/xsd/cxx/xml/qualified-name.hxx +++ b/libxsd/xsd/cxx/xml/qualified-name.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/qualified-name.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_QUALIFIED_NAME_HXX diff --git a/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx b/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx index e0610b5..7ceecbe 100644 --- a/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx +++ b/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/sax/bits/error-handler-proxy.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_SAX_ERROR_HANDLER_PROXY_HXX diff --git a/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.txx b/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.txx index 5100b58..58cef7a 100644 --- a/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.txx +++ b/libxsd/xsd/cxx/xml/sax/bits/error-handler-proxy.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/sax/bits/error-handler-proxy.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #include <xsd/cxx/xml/string.hxx> diff --git a/libxsd/xsd/cxx/xml/sax/std-input-source.hxx b/libxsd/xsd/cxx/xml/sax/std-input-source.hxx index bc2a84f..f4376d1 100644 --- a/libxsd/xsd/cxx/xml/sax/std-input-source.hxx +++ b/libxsd/xsd/cxx/xml/sax/std-input-source.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/sax/std-input-source.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_SAX_STD_INPUT_SOURCE_HXX diff --git a/libxsd/xsd/cxx/xml/std-memory-manager.hxx b/libxsd/xsd/cxx/xml/std-memory-manager.hxx index 232df6f..b6454a8 100644 --- a/libxsd/xsd/cxx/xml/std-memory-manager.hxx +++ b/libxsd/xsd/cxx/xml/std-memory-manager.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/std-memory-manager.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_STD_MEMORY_MANAGER_HXX diff --git a/libxsd/xsd/cxx/xml/string.hxx b/libxsd/xsd/cxx/xml/string.hxx index f9cb11b..252bb82 100644 --- a/libxsd/xsd/cxx/xml/string.hxx +++ b/libxsd/xsd/cxx/xml/string.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/string.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_STRING_HXX diff --git a/libxsd/xsd/cxx/xml/string.ixx b/libxsd/xsd/cxx/xml/string.ixx index b8f312a..f93a498 100644 --- a/libxsd/xsd/cxx/xml/string.ixx +++ b/libxsd/xsd/cxx/xml/string.ixx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/string.ixx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_STRING_IXX diff --git a/libxsd/xsd/cxx/xml/string.txx b/libxsd/xsd/cxx/xml/string.txx index 9d33980..bf4617d 100644 --- a/libxsd/xsd/cxx/xml/string.txx +++ b/libxsd/xsd/cxx/xml/string.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/xml/string.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_XML_STRING_TXX diff --git a/libxsd/xsd/cxx/zc-istream.hxx b/libxsd/xsd/cxx/zc-istream.hxx index 04af2ee..ed451a3 100644 --- a/libxsd/xsd/cxx/zc-istream.hxx +++ b/libxsd/xsd/cxx/zc-istream.hxx @@ -1,5 +1,4 @@ // file : xsd/cxx/zc-istream.hxx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file #ifndef XSD_CXX_ZC_ISTREAM_HXX diff --git a/libxsd/xsd/cxx/zc-istream.txx b/libxsd/xsd/cxx/zc-istream.txx index a6998e4..4d76efb 100644 --- a/libxsd/xsd/cxx/zc-istream.txx +++ b/libxsd/xsd/cxx/zc-istream.txx @@ -1,5 +1,4 @@ // file : xsd/cxx/zc-istream.txx -// copyright : Copyright (c) 2005-2017 Code Synthesis Tools CC // license : GNU GPL v2 + exceptions; see accompanying LICENSE file namespace xsd |