diff options
Diffstat (limited to 'xsd-tests/cxx/parser')
46 files changed, 107 insertions, 75 deletions
diff --git a/xsd-tests/cxx/parser/built-in/buildfile b/xsd-tests/cxx/parser/built-in/buildfile index 0522c9a..13ae128 100644 --- a/xsd-tests/cxx/parser/built-in/buildfile +++ b/xsd-tests/cxx/parser/built-in/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/built-in/driver.cxx b/xsd-tests/cxx/parser/built-in/driver.cxx index 008bc2d..aab2f19 100644 --- a/xsd-tests/cxx/parser/built-in/driver.cxx +++ b/xsd-tests/cxx/parser/built-in/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; diff --git a/xsd-tests/cxx/parser/enumeration/buildfile b/xsd-tests/cxx/parser/enumeration/buildfile index 05163df..fe5933a 100644 --- a/xsd-tests/cxx/parser/enumeration/buildfile +++ b/xsd-tests/cxx/parser/enumeration/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} map{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/enumeration/driver.cxx b/xsd-tests/cxx/parser/enumeration/driver.cxx index 4776ee2..d5488f7 100644 --- a/xsd-tests/cxx/parser/enumeration/driver.cxx +++ b/xsd-tests/cxx/parser/enumeration/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace xml_schema; diff --git a/xsd-tests/cxx/parser/generated-impl/buildfile b/xsd-tests/cxx/parser/generated-impl/buildfile index 8710a77..f6932f9 100644 --- a/xsd-tests/cxx/parser/generated-impl/buildfile +++ b/xsd-tests/cxx/parser/generated-impl/buildfile @@ -16,9 +16,7 @@ exe{driver}: file{output}: test.stdout = true {hxx cxx}{test-pimpl} \ { cxx}{test-driver}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --generate-print-impl \ diff --git a/xsd-tests/cxx/parser/list/buildfile b/xsd-tests/cxx/parser/list/buildfile index 426101e..5f44a93 100644 --- a/xsd-tests/cxx/parser/list/buildfile +++ b/xsd-tests/cxx/parser/list/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/list/driver.cxx b/xsd-tests/cxx/parser/list/driver.cxx index 382da5b..42d3255 100644 --- a/xsd-tests/cxx/parser/list/driver.cxx +++ b/xsd-tests/cxx/parser/list/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile index 4bd7b48..d6065be 100644 --- a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile +++ b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx b/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx index 9e9b905..cdb2b22 100644 --- a/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx +++ b/xsd-tests/cxx/parser/name-clash/inheritance/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile index 629645b..02b1b41 100644 --- a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile +++ b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx b/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx index 26793a0..4e7ffde 100644 --- a/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx +++ b/xsd-tests/cxx/parser/polymorphism/recursive/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" #include "test-pimpl.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx b/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx index 7c7f410..ba44859 100644 --- a/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx +++ b/xsd-tests/cxx/parser/polymorphism/recursive/test-pimpl.cxx @@ -5,6 +5,9 @@ #include "test-pimpl.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; namespace test diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile index d98e917..4303002 100644 --- a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile +++ b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx b/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx index 6da4a0a..cf0180b 100644 --- a/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx +++ b/xsd-tests/cxx/parser/polymorphism/same-type/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/recursive/buildfile b/xsd-tests/cxx/parser/recursive/buildfile index 237855c..395908e 100644 --- a/xsd-tests/cxx/parser/recursive/buildfile +++ b/xsd-tests/cxx/parser/recursive/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/recursive/driver.cxx b/xsd-tests/cxx/parser/recursive/driver.cxx index c93fd35..0877dfc 100644 --- a/xsd-tests/cxx/parser/recursive/driver.cxx +++ b/xsd-tests/cxx/parser/recursive/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; struct sub_pimpl: sub_type_pskel diff --git a/xsd-tests/cxx/parser/test-template/buildfile b/xsd-tests/cxx/parser/test-template/buildfile index 9f7f5d3..aad21e7 100644 --- a/xsd-tests/cxx/parser/test-template/buildfile +++ b/xsd-tests/cxx/parser/test-template/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/test-template/driver.cxx b/xsd-tests/cxx/parser/test-template/driver.cxx index 333c6fd..74c8c99 100644 --- a/xsd-tests/cxx/parser/test-template/driver.cxx +++ b/xsd-tests/cxx/parser/test-template/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/union/buildfile b/xsd-tests/cxx/parser/union/buildfile index 1a8615c..6694d5f 100644 --- a/xsd-tests/cxx/parser/union/buildfile +++ b/xsd-tests/cxx/parser/union/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/union/driver.cxx b/xsd-tests/cxx/parser/union/driver.cxx index c5b5c71..d133b41 100644 --- a/xsd-tests/cxx/parser/union/driver.cxx +++ b/xsd-tests/cxx/parser/union/driver.cxx @@ -9,6 +9,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/validation/all/buildfile b/xsd-tests/cxx/parser/validation/all/buildfile index 555843e..e9c0550 100644 --- a/xsd-tests/cxx/parser/validation/all/buildfile +++ b/xsd-tests/cxx/parser/validation/all/buildfile @@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/all/driver.cxx b/xsd-tests/cxx/parser/validation/all/driver.cxx index a8cbcca..31081cb 100644 --- a/xsd-tests/cxx/parser/validation/all/driver.cxx +++ b/xsd-tests/cxx/parser/validation/all/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/validation/any/buildfile b/xsd-tests/cxx/parser/validation/any/buildfile index 57135f4..9867f51 100644 --- a/xsd-tests/cxx/parser/validation/any/buildfile +++ b/xsd-tests/cxx/parser/validation/any/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/any/driver.cxx b/xsd-tests/cxx/parser/validation/any/driver.cxx index 1eceda6..2f22d37 100644 --- a/xsd-tests/cxx/parser/validation/any/driver.cxx +++ b/xsd-tests/cxx/parser/validation/any/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; @@ -35,7 +38,7 @@ struct any_a_pimpl: any_a_pskel } virtual void - _start_any_element (ro_string const&, + _start_any_element (ro_string const&, ro_string const& n, ro_string const*) { diff --git a/xsd-tests/cxx/parser/validation/attribute/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile index d486193..0dfe365 100644 --- a/xsd-tests/cxx/parser/validation/attribute/buildfile +++ b/xsd-tests/cxx/parser/validation/attribute/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/attribute/driver.cxx b/xsd-tests/cxx/parser/validation/attribute/driver.cxx index 4710564..a98796e 100644 --- a/xsd-tests/cxx/parser/validation/attribute/driver.cxx +++ b/xsd-tests/cxx/parser/validation/attribute/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile index a6f366b..8efcacc 100644 --- a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile +++ b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile @@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx index cbeb864..35b3927 100644 --- a/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/any-type/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; @@ -23,7 +26,7 @@ struct any_type_pimpl: xml_schema::any_type_pimpl } virtual void - _start_any_element (ro_string const&, + _start_any_element (ro_string const&, ro_string const& n, ro_string const*) { diff --git a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx index 3fe20ec..b3f0dbf 100644 --- a/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/binary/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in base64Binary and hexBinary types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx index f1499cd..3b25ffe 100644 --- a/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/boolean/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in boolean type validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; bool diff --git a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx index b533cfd..9b0e9a1 100644 --- a/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/byte/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in byte and unsigned byte types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx index da02a50..36f384f 100644 --- a/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/date-time/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in date and time types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx index e92c419..87a744d 100644 --- a/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/float/driver.cxx @@ -4,11 +4,13 @@ // Test the built-in float, double, and decimal types validation. // #include <math.h> -#include <cassert> #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx index 270cd0e..7e68b35 100644 --- a/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/int/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in int and unsigned int types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx index 3a5fdd5..4f8a80c 100644 --- a/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/integer/driver.cxx @@ -7,11 +7,13 @@ #include <string> #include <sstream> -#include <cassert> #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace std; using namespace xsd::cxx::parser::validating; diff --git a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx index a4ab565..41feb0b 100644 --- a/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/long/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in long and unsigned long types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx index 85acd1c..8845b38 100644 --- a/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/qname/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in QName type validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; bool diff --git a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx index 7c79b22..f09f975 100644 --- a/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/short/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in short and unsigned short types validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx index 920385a..d74ee52 100644 --- a/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/string/driver.cxx @@ -4,11 +4,13 @@ // Test the built-in string & friends types validation. // #include <string> -#include <cassert> #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; template <typename T> diff --git a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx index dcc9242..c296858 100644 --- a/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx +++ b/xsd-tests/cxx/parser/validation/built-in/uri/driver.cxx @@ -3,11 +3,12 @@ // Test the built-in anyURI type validation. // -#include <cassert> - #include <xsd/cxx/parser/validating/exceptions.hxx> #include <xsd/cxx/parser/validating/xml-schema-pimpl.hxx> +#undef NDEBUG +#include <cassert> + using namespace xsd::cxx::parser::validating; int diff --git a/xsd-tests/cxx/parser/validation/choice/buildfile b/xsd-tests/cxx/parser/validation/choice/buildfile index adf0832..06eca85 100644 --- a/xsd-tests/cxx/parser/validation/choice/buildfile +++ b/xsd-tests/cxx/parser/validation/choice/buildfile @@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/choice/driver.cxx b/xsd-tests/cxx/parser/validation/choice/driver.cxx index 4a52c5d..edfb15d 100644 --- a/xsd-tests/cxx/parser/validation/choice/driver.cxx +++ b/xsd-tests/cxx/parser/validation/choice/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; diff --git a/xsd-tests/cxx/parser/validation/restriction/buildfile b/xsd-tests/cxx/parser/validation/restriction/buildfile index 4c415bf..1086ea0 100644 --- a/xsd-tests/cxx/parser/validation/restriction/buildfile +++ b/xsd-tests/cxx/parser/validation/restriction/buildfile @@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/restriction/driver.cxx b/xsd-tests/cxx/parser/validation/restriction/driver.cxx index 206b9f8..ea7f192 100644 --- a/xsd-tests/cxx/parser/validation/restriction/driver.cxx +++ b/xsd-tests/cxx/parser/validation/restriction/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; diff --git a/xsd-tests/cxx/parser/validation/sequence/buildfile b/xsd-tests/cxx/parser/validation/sequence/buildfile index b205091..2ca2b6a 100644 --- a/xsd-tests/cxx/parser/validation/sequence/buildfile +++ b/xsd-tests/cxx/parser/validation/sequence/buildfile @@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/parser/validation/sequence/driver.cxx b/xsd-tests/cxx/parser/validation/sequence/driver.cxx index 6b5bf70..07d33e2 100644 --- a/xsd-tests/cxx/parser/validation/sequence/driver.cxx +++ b/xsd-tests/cxx/parser/validation/sequence/driver.cxx @@ -10,6 +10,9 @@ #include "test-pskel.hxx" +#undef NDEBUG +#include <cassert> + using namespace std; using namespace test; using xml_schema::ro_string; @@ -59,7 +62,7 @@ struct sequence_pimpl: sequence_pskel } virtual void - _start_any_element (ro_string const& ns, + _start_any_element (ro_string const& ns, ro_string const& name, ro_string const*) { |