diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2023-09-05 15:20:13 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2023-09-06 11:44:16 +0300 |
| commit | 28f737a15d9ce5d9e8b06ab768ef858c07ae510e (patch) | |
| tree | 7523a801d1326a6e8ba0646d8d4b927f1eaa608b | |
| parent | 0c40310afde1d595697d0edfb3b174a9738605cf (diff) | |
Make c++11 value default for xsd --std option
Also add support for c++14, c++17, c++20, and c++23 values and drop passing
--std option in tests and examples.
130 files changed, 218 insertions, 176 deletions
diff --git a/xsd-examples/cxx/parser/generated/buildfile b/xsd-examples/cxx/parser/generated/buildfile index 3c2a0ba..85aded9 100644 --- a/xsd-examples/cxx/parser/generated/buildfile +++ b/xsd-examples/cxx/parser/generated/buildfile @@ -17,7 +17,7 @@ exe{driver}: xml{library}: test.input = true {hxx cxx}{library-pimpl} \ { cxx}{library-driver}>: xsd{library} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --generate-print-impl \ diff --git a/xsd-examples/cxx/parser/hello/buildfile b/xsd-examples/cxx/parser/hello/buildfile index 4148dd3..c136334 100644 --- a/xsd-examples/cxx/parser/hello/buildfile +++ b/xsd-examples/cxx/parser/hello/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{hello}: test.input = true <{hxx ixx cxx}{hello-pskel}>: xsd{hello} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/parser/library/buildfile b/xsd-examples/cxx/parser/library/buildfile index 13a3e1e..2d463e5 100644 --- a/xsd-examples/cxx/parser/library/buildfile +++ b/xsd-examples/cxx/parser/library/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library-pskel}>: xsd{library} map{library} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --type-map $path($<[1]) \ diff --git a/xsd-examples/cxx/parser/mixed/buildfile b/xsd-examples/cxx/parser/mixed/buildfile index 9d3a629..103d94b 100644 --- a/xsd-examples/cxx/parser/mixed/buildfile +++ b/xsd-examples/cxx/parser/mixed/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{text}: test.input = true <{hxx ixx cxx}{text-pskel}>: xsd{text} map{text} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --type-map $path($<[1]) \ diff --git a/xsd-examples/cxx/parser/mixin/buildfile b/xsd-examples/cxx/parser/mixin/buildfile index 279ae39..7b6cee2 100644 --- a/xsd-examples/cxx/parser/mixin/buildfile +++ b/xsd-examples/cxx/parser/mixin/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{instance}: test.input = true <{hxx ixx cxx}{schema-pskel}>: xsd{schema} map{schema} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --type-map $path($<[1]) \ diff --git a/xsd-examples/cxx/parser/multiroot/buildfile b/xsd-examples/cxx/parser/multiroot/buildfile index d582e19..4c97ca1 100644 --- a/xsd-examples/cxx/parser/multiroot/buildfile +++ b/xsd-examples/cxx/parser/multiroot/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -protocol-pskel} {hxx ixx cxx}{protocol-pskel} $libs \ <{hxx ixx cxx}{protocol-pskel}>: xsd{protocol} map{protocol} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --type-map $path($<[1]) \ diff --git a/xsd-examples/cxx/parser/performance/buildfile b/xsd-examples/cxx/parser/performance/buildfile index 094dd7b..1d0edd7 100644 --- a/xsd-examples/cxx/parser/performance/buildfile +++ b/xsd-examples/cxx/parser/performance/buildfile @@ -33,7 +33,7 @@ for p: 'xerces' 'expat' parser = $p } {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -$parser-pskel \ --xml-parser $parser \ diff --git a/xsd-examples/cxx/parser/polymorphism/buildfile b/xsd-examples/cxx/parser/polymorphism/buildfile index a08dfd5..2fad7dd 100644 --- a/xsd-examples/cxx/parser/polymorphism/buildfile +++ b/xsd-examples/cxx/parser/polymorphism/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{supermen}: test.input = true <{hxx ixx cxx}{supermen-pskel}>: xsd{supermen} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --generate-polymorphic \ diff --git a/xsd-examples/cxx/parser/polyroot/buildfile b/xsd-examples/cxx/parser/polyroot/buildfile index 898551d..c1943d4 100644 --- a/xsd-examples/cxx/parser/polyroot/buildfile +++ b/xsd-examples/cxx/parser/polyroot/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -supermen-pskel} {hxx ixx cxx}{supermen-pskel} $libs \ <{hxx ixx cxx}{supermen-pskel}>: xsd{supermen} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --generate-polymorphic \ diff --git a/xsd-examples/cxx/parser/wildcard/buildfile b/xsd-examples/cxx/parser/wildcard/buildfile index 55a8a35..5866f38 100644 --- a/xsd-examples/cxx/parser/wildcard/buildfile +++ b/xsd-examples/cxx/parser/wildcard/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{email}: test.input = true <{hxx ixx cxx}{email-pskel}>: xsd{email} $xsd {{ - $xsd cxx-parser --std c++11 \ + $xsd cxx-parser \ --generate-inline \ --skel-file-suffix -pskel \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/binary/boost/buildfile b/xsd-examples/cxx/tree/binary/boost/buildfile index 7385b9e..17e67fb 100644 --- a/xsd-examples/cxx/tree/binary/boost/buildfile +++ b/xsd-examples/cxx/tree/binary/boost/buildfile @@ -13,7 +13,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} hxx{library-prologue} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --hxx-prologue-file $path($<[1]) \ diff --git a/xsd-examples/cxx/tree/binary/cdr/buildfile b/xsd-examples/cxx/tree/binary/cdr/buildfile index c28806a..ccff659 100644 --- a/xsd-examples/cxx/tree/binary/cdr/buildfile +++ b/xsd-examples/cxx/tree/binary/cdr/buildfile @@ -13,7 +13,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-insertion 'ACE_OutputCDR' \ diff --git a/xsd-examples/cxx/tree/binary/xdr/buildfile b/xsd-examples/cxx/tree/binary/xdr/buildfile index c25803d..0fbab13 100644 --- a/xsd-examples/cxx/tree/binary/xdr/buildfile +++ b/xsd-examples/cxx/tree/binary/xdr/buildfile @@ -15,7 +15,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-insertion 'XDR' \ diff --git a/xsd-examples/cxx/tree/caching/buildfile b/xsd-examples/cxx/tree/caching/buildfile index d550be3..f1bcb10 100644 --- a/xsd-examples/cxx/tree/caching/buildfile +++ b/xsd-examples/cxx/tree/caching/buildfile @@ -12,7 +12,7 @@ exe{driver}: {xml xsd}{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/compression/buildfile b/xsd-examples/cxx/tree/compression/buildfile index a095cf9..99dd8a6 100644 --- a/xsd-examples/cxx/tree/compression/buildfile +++ b/xsd-examples/cxx/tree/compression/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -library} {hxx ixx cxx}{library} $libs testscript <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-examples/cxx/tree/custom/calendar/buildfile b/xsd-examples/cxx/tree/custom/calendar/buildfile index 4085561..3309f6f 100644 --- a/xsd-examples/cxx/tree/custom/calendar/buildfile +++ b/xsd-examples/cxx/tree/custom/calendar/buildfile @@ -16,7 +16,7 @@ exe{driver}: xml{calendar}: test.input = true <{hxx ixx cxx}{calendar}>: xsd{calendar} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --extern-xml-schema xml-schema.xsd \ --output-dir $out_base \ @@ -30,7 +30,7 @@ hxx{xml-schema}: $xsd # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --custom-type date \ --hxx-epilogue '#include "xml-schema-custom.hxx"' \ diff --git a/xsd-examples/cxx/tree/custom/comments/buildfile b/xsd-examples/cxx/tree/custom/comments/buildfile index 93196d2..6edf81a 100644 --- a/xsd-examples/cxx/tree/custom/comments/buildfile +++ b/xsd-examples/cxx/tree/custom/comments/buildfile @@ -15,7 +15,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd \ @@ -30,7 +30,7 @@ hxx{xml-schema}: $xsd # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --generate-serialization \ --custom-type anyType=/type_base \ diff --git a/xsd-examples/cxx/tree/custom/contacts/buildfile b/xsd-examples/cxx/tree/custom/contacts/buildfile index 9835bbf..e401362 100644 --- a/xsd-examples/cxx/tree/custom/contacts/buildfile +++ b/xsd-examples/cxx/tree/custom/contacts/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{contacts}: test.input = true <{hxx ixx cxx}{contacts}>: xsd{contacts} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --custom-type contact=/contact_base \ --hxx-epilogue '#include "contacts-custom.hxx"' \ diff --git a/xsd-examples/cxx/tree/custom/double/buildfile b/xsd-examples/cxx/tree/custom/double/buildfile index 03c8cde..0c33afe 100644 --- a/xsd-examples/cxx/tree/custom/double/buildfile +++ b/xsd-examples/cxx/tree/custom/double/buildfile @@ -13,7 +13,7 @@ exe{driver}: {hxx cxx}{* -order -xml-schema} \ <{hxx ixx cxx}{order}>: xsd{order} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd \ @@ -28,7 +28,7 @@ hxx{xml-schema}: $xsd # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --generate-serialization \ --custom-type double=double \ diff --git a/xsd-examples/cxx/tree/custom/mixed/buildfile b/xsd-examples/cxx/tree/custom/mixed/buildfile index 595f8b2..e5919fe 100644 --- a/xsd-examples/cxx/tree/custom/mixed/buildfile +++ b/xsd-examples/cxx/tree/custom/mixed/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --custom-type bio=/bio_base \ diff --git a/xsd-examples/cxx/tree/custom/taxonomy/buildfile b/xsd-examples/cxx/tree/custom/taxonomy/buildfile index 520470a..4068daa 100644 --- a/xsd-examples/cxx/tree/custom/taxonomy/buildfile +++ b/xsd-examples/cxx/tree/custom/taxonomy/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people} hxx{people-fwd}>: xsd{people} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-forward \ --generate-polymorphic \ diff --git a/xsd-examples/cxx/tree/custom/wildcard/buildfile b/xsd-examples/cxx/tree/custom/wildcard/buildfile index a0cd709..1bb5a8f 100644 --- a/xsd-examples/cxx/tree/custom/wildcard/buildfile +++ b/xsd-examples/cxx/tree/custom/wildcard/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{wildcard}: test.input = true <{hxx ixx cxx}{wildcard}>: xsd{wildcard} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-examples/cxx/tree/embedded/buildfile b/xsd-examples/cxx/tree/embedded/buildfile index 583e34e..20b7207 100644 --- a/xsd-examples/cxx/tree/embedded/buildfile +++ b/xsd-examples/cxx/tree/embedded/buildfile @@ -17,7 +17,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/hello/buildfile b/xsd-examples/cxx/tree/hello/buildfile index b842c00..1cd17ac 100644 --- a/xsd-examples/cxx/tree/hello/buildfile +++ b/xsd-examples/cxx/tree/hello/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{hello}: test.input = true <{hxx ixx cxx}{hello}>: xsd{hello} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/library/buildfile b/xsd-examples/cxx/tree/library/buildfile index da37919..03745fb 100644 --- a/xsd-examples/cxx/tree/library/buildfile +++ b/xsd-examples/cxx/tree/library/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/messaging/buildfile b/xsd-examples/cxx/tree/messaging/buildfile index 4bb3570..7be8caf 100644 --- a/xsd-examples/cxx/tree/messaging/buildfile +++ b/xsd-examples/cxx/tree/messaging/buildfile @@ -10,7 +10,7 @@ exe{driver}: {hxx cxx}{* -protocol} {hxx ixx cxx}{protocol} $libs testscript <{hxx ixx cxx}{protocol}>: xsd{protocol} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --root-element-all \ --generate-element-type \ diff --git a/xsd-examples/cxx/tree/mixed/buildfile b/xsd-examples/cxx/tree/mixed/buildfile index c6c13a0..c91021a 100644 --- a/xsd-examples/cxx/tree/mixed/buildfile +++ b/xsd-examples/cxx/tree/mixed/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{text}: test.input = true <{hxx ixx cxx}{text}>: xsd{text} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/multiroot/buildfile b/xsd-examples/cxx/tree/multiroot/buildfile index 6f6e1fe..55ddb0d 100644 --- a/xsd-examples/cxx/tree/multiroot/buildfile +++ b/xsd-examples/cxx/tree/multiroot/buildfile @@ -10,7 +10,7 @@ exe{driver}: {hxx cxx}{* -protocol} {hxx ixx cxx}{protocol} $libs testscript <{hxx ixx cxx}{protocol}>: xsd{protocol} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --root-element-all \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/order/element/buildfile b/xsd-examples/cxx/tree/order/element/buildfile index d3c3bd6..6e56a60 100644 --- a/xsd-examples/cxx/tree/order/element/buildfile +++ b/xsd-examples/cxx/tree/order/element/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{transactions}: test.input = true <{hxx ixx cxx}{transactions}>: xsd{transactions} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-wildcard \ diff --git a/xsd-examples/cxx/tree/order/mixed/buildfile b/xsd-examples/cxx/tree/order/mixed/buildfile index 0125f8d..6bc21e2 100644 --- a/xsd-examples/cxx/tree/order/mixed/buildfile +++ b/xsd-examples/cxx/tree/order/mixed/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{text}: test.input = true <{hxx ixx cxx}{text}>: xsd{text} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --ordered-type-mixed \ diff --git a/xsd-examples/cxx/tree/performance/buildfile b/xsd-examples/cxx/tree/performance/buildfile index e2fb4be..7b28308 100644 --- a/xsd-examples/cxx/tree/performance/buildfile +++ b/xsd-examples/cxx/tree/performance/buildfile @@ -14,7 +14,7 @@ exe{driver}: xml{test-50k}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/polymorphism/buildfile b/xsd-examples/cxx/tree/polymorphism/buildfile index ea92889..359d4d3 100644 --- a/xsd-examples/cxx/tree/polymorphism/buildfile +++ b/xsd-examples/cxx/tree/polymorphism/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{supermen}: test.input = true <{hxx ixx cxx}{supermen}>: xsd{supermen} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-polymorphic \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/secure/buildfile b/xsd-examples/cxx/tree/secure/buildfile index e4086be..a86af57 100644 --- a/xsd-examples/cxx/tree/secure/buildfile +++ b/xsd-examples/cxx/tree/secure/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/streaming/buildfile b/xsd-examples/cxx/tree/streaming/buildfile index 91ab678..8555257 100644 --- a/xsd-examples/cxx/tree/streaming/buildfile +++ b/xsd-examples/cxx/tree/streaming/buildfile @@ -10,7 +10,7 @@ exe{driver}: {hxx cxx}{* -position} {hxx ixx cxx}{position} $libs testscript <{hxx ixx cxx}{position}>: xsd{position} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/wildcard/buildfile b/xsd-examples/cxx/tree/wildcard/buildfile index 8661865..dc158f4 100644 --- a/xsd-examples/cxx/tree/wildcard/buildfile +++ b/xsd-examples/cxx/tree/wildcard/buildfile @@ -12,7 +12,7 @@ exe{driver}: xml{email}: test.input = true <{hxx ixx cxx}{email}>: xsd{email} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-wildcard \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/xpath/buildfile b/xsd-examples/cxx/tree/xpath/buildfile index 7cc5020..4f49599 100644 --- a/xsd-examples/cxx/tree/xpath/buildfile +++ b/xsd-examples/cxx/tree/xpath/buildfile @@ -13,7 +13,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/clash/buildfile b/xsd-tests/clash/buildfile index 6b8f48b..b87d6aa 100644 --- a/xsd-tests/clash/buildfile +++ b/xsd-tests/clash/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/code/name-conflict/buildfile b/xsd-tests/code/name-conflict/buildfile index cc90ab4..03051a5 100644 --- a/xsd-tests/code/name-conflict/buildfile +++ b/xsd-tests/code/name-conflict/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/code/name-escaping/buildfile b/xsd-tests/code/name-escaping/buildfile index c2d6467..debfe58 100644 --- a/xsd-tests/code/name-escaping/buildfile +++ b/xsd-tests/code/name-escaping/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/cxx/parser/built-in/buildfile b/xsd-tests/cxx/parser/built-in/buildfile index 3da3a59..13ae128 100644 --- a/xsd-tests/cxx/parser/built-in/buildfile +++ b/xsd-tests/cxx/parser/built-in/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/enumeration/buildfile index d050054..fe5933a 100644 --- a/xsd-tests/cxx/parser/enumeration/buildfile +++ b/xsd-tests/cxx/parser/enumeration/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} map{test} $xsd {{ - $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/generated-impl/buildfile b/xsd-tests/cxx/parser/generated-impl/buildfile index bcb5d12..f6932f9 100644 --- a/xsd-tests/cxx/parser/generated-impl/buildfile +++ b/xsd-tests/cxx/parser/generated-impl/buildfile @@ -16,7 +16,7 @@ exe{driver}: file{output}: test.stdout = true {hxx cxx}{test-pimpl} \ { cxx}{test-driver}>: xsd{test} $xsd {{ - $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 d85aa75..5f44a93 100644 --- a/xsd-tests/cxx/parser/list/buildfile +++ b/xsd-tests/cxx/parser/list/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile index 66e8bae..d6065be 100644 --- a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile +++ b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile index ff43afa..02b1b41 100644 --- a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile +++ b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile index 039b063..4303002 100644 --- a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile +++ b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/recursive/buildfile index 583206f..395908e 100644 --- a/xsd-tests/cxx/parser/recursive/buildfile +++ b/xsd-tests/cxx/parser/recursive/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/test-template/buildfile index 761a437..aad21e7 100644 --- a/xsd-tests/cxx/parser/test-template/buildfile +++ b/xsd-tests/cxx/parser/test-template/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/union/buildfile index e73ae2e..6694d5f 100644 --- a/xsd-tests/cxx/parser/union/buildfile +++ b/xsd-tests/cxx/parser/union/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/all/buildfile index fc48800..e9c0550 100644 --- a/xsd-tests/cxx/parser/validation/all/buildfile +++ b/xsd-tests/cxx/parser/validation/all/buildfile @@ -9,7 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/any/buildfile index 29ea8e2..9867f51 100644 --- a/xsd-tests/cxx/parser/validation/any/buildfile +++ b/xsd-tests/cxx/parser/validation/any/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile index 9253c19..0dfe365 100644 --- a/xsd-tests/cxx/parser/validation/attribute/buildfile +++ b/xsd-tests/cxx/parser/validation/attribute/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile index b557864..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,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/choice/buildfile index 8cff0ba..06eca85 100644 --- a/xsd-tests/cxx/parser/validation/choice/buildfile +++ b/xsd-tests/cxx/parser/validation/choice/buildfile @@ -9,7 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/restriction/buildfile index b247303..1086ea0 100644 --- a/xsd-tests/cxx/parser/validation/restriction/buildfile +++ b/xsd-tests/cxx/parser/validation/restriction/buildfile @@ -9,7 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/buildfile b/xsd-tests/cxx/parser/validation/sequence/buildfile index a7f00a6..2ca2b6a 100644 --- a/xsd-tests/cxx/parser/validation/sequence/buildfile +++ b/xsd-tests/cxx/parser/validation/sequence/buildfile @@ -9,7 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \ <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd {{ - $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/tree/any-type/buildfile b/xsd-tests/cxx/tree/any-type/buildfile index 74cc9d9..6f3a355 100644 --- a/xsd-tests/cxx/tree/any-type/buildfile +++ b/xsd-tests/cxx/tree/any-type/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-any-type \ diff --git a/xsd-tests/cxx/tree/binary/cdr/buildfile b/xsd-tests/cxx/tree/binary/cdr/buildfile index 581a632..7518f04 100644 --- a/xsd-tests/cxx/tree/binary/cdr/buildfile +++ b/xsd-tests/cxx/tree/binary/cdr/buildfile @@ -11,7 +11,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-insertion 'ACE_OutputCDR' \ --generate-extraction 'ACE_InputCDR' \ diff --git a/xsd-tests/cxx/tree/binary/polymorphic/buildfile b/xsd-tests/cxx/tree/binary/polymorphic/buildfile index 701f36a..1212a34 100644 --- a/xsd-tests/cxx/tree/binary/polymorphic/buildfile +++ b/xsd-tests/cxx/tree/binary/polymorphic/buildfile @@ -11,7 +11,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-polymorphic \ --root-element-last \ diff --git a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile index 4900478..93e1701 100644 --- a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile +++ b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile @@ -13,7 +13,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-insertion 'XDR' \ --generate-extraction 'XDR' \ diff --git a/xsd-tests/cxx/tree/binary/xdr/buildfile b/xsd-tests/cxx/tree/binary/xdr/buildfile index aefb3cf..0c738f6 100644 --- a/xsd-tests/cxx/tree/binary/xdr/buildfile +++ b/xsd-tests/cxx/tree/binary/xdr/buildfile @@ -13,7 +13,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-insertion 'XDR' \ --generate-extraction 'XDR' \ diff --git a/xsd-tests/cxx/tree/built-in/buildfile b/xsd-tests/cxx/tree/built-in/buildfile index d84e542..5570ff0 100644 --- a/xsd-tests/cxx/tree/built-in/buildfile +++ b/xsd-tests/cxx/tree/built-in/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -types} {hxx ixx cxx}{types} $libs testscript <{hxx ixx cxx}{types}>: xsd{types} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-serialization \ diff --git a/xsd-tests/cxx/tree/chameleon/buildfile b/xsd-tests/cxx/tree/chameleon/buildfile index a30c93e..c04c4b9 100644 --- a/xsd-tests/cxx/tree/chameleon/buildfile +++ b/xsd-tests/cxx/tree/chameleon/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{includer}>: xsd{includer includee} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --root-element root \ diff --git a/xsd-tests/cxx/tree/comparison/buildfile b/xsd-tests/cxx/tree/comparison/buildfile index d106e30..c1ece3a 100644 --- a/xsd-tests/cxx/tree/comparison/buildfile +++ b/xsd-tests/cxx/tree/comparison/buildfile @@ -10,7 +10,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-comparison \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/compilation/buildfile b/xsd-tests/cxx/tree/compilation/buildfile index 79a72df..26cf0f0 100644 --- a/xsd-tests/cxx/tree/compilation/buildfile +++ b/xsd-tests/cxx/tree/compilation/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/complex/ctor/buildfile b/xsd-tests/cxx/tree/complex/ctor/buildfile index fccdac0..14a4340 100644 --- a/xsd-tests/cxx/tree/complex/ctor/buildfile +++ b/xsd-tests/cxx/tree/complex/ctor/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-default-ctor \ --generate-from-base-ctor \ diff --git a/xsd-tests/cxx/tree/containment/buildfile b/xsd-tests/cxx/tree/containment/buildfile index dbdea4a..f241817 100644 --- a/xsd-tests/cxx/tree/containment/buildfile +++ b/xsd-tests/cxx/tree/containment/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-default-ctor \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/default/general/buildfile b/xsd-tests/cxx/tree/default/general/buildfile index c84665f..7ccc174 100644 --- a/xsd-tests/cxx/tree/default/general/buildfile +++ b/xsd-tests/cxx/tree/default/general/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-tests/cxx/tree/default/omit/buildfile b/xsd-tests/cxx/tree/default/omit/buildfile index af3ce3c..ee6d678 100644 --- a/xsd-tests/cxx/tree/default/omit/buildfile +++ b/xsd-tests/cxx/tree/default/omit/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-tests/cxx/tree/detach/buildfile b/xsd-tests/cxx/tree/detach/buildfile index c0b0f73..8a27a2c 100644 --- a/xsd-tests/cxx/tree/detach/buildfile +++ b/xsd-tests/cxx/tree/detach/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-detach \ --generate-default-ctor \ diff --git a/xsd-tests/cxx/tree/dom-association/buildfile b/xsd-tests/cxx/tree/dom-association/buildfile index 4a9df12..b6f6e0e 100644 --- a/xsd-tests/cxx/tree/dom-association/buildfile +++ b/xsd-tests/cxx/tree/dom-association/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile index 7d38ce6..a64f457 100644 --- a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile +++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --char-encoding iso8859-1 \ diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile index 3b0dfdf..65d2f16 100644 --- a/xsd-tests/cxx/tree/encoding/char/lcp/buildfile +++ b/xsd-tests/cxx/tree/encoding/char/lcp/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --char-encoding lcp \ diff --git a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile index 60c7f64..c4b06b1 100644 --- a/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile +++ b/xsd-tests/cxx/tree/encoding/char/utf-8/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-doxygen \ diff --git a/xsd-tests/cxx/tree/encoding/wchar/buildfile b/xsd-tests/cxx/tree/encoding/wchar/buildfile index b330416..cdc8e60 100644 --- a/xsd-tests/cxx/tree/encoding/wchar/buildfile +++ b/xsd-tests/cxx/tree/encoding/wchar/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --char-type wchar_t \ diff --git a/xsd-tests/cxx/tree/enumeration/ctor/buildfile b/xsd-tests/cxx/tree/enumeration/ctor/buildfile index 7d9c030..41a8028 100644 --- a/xsd-tests/cxx/tree/enumeration/ctor/buildfile +++ b/xsd-tests/cxx/tree/enumeration/ctor/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-default-ctor \ --generate-from-base-ctor \ diff --git a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile index 62ee2d7..beb0add 100644 --- a/xsd-tests/cxx/tree/enumeration/inheritance/buildfile +++ b/xsd-tests/cxx/tree/enumeration/inheritance/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/float/buildfile b/xsd-tests/cxx/tree/float/buildfile index d9286b5..92a5937 100644 --- a/xsd-tests/cxx/tree/float/buildfile +++ b/xsd-tests/cxx/tree/float/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --root-element-all \ diff --git a/xsd-tests/cxx/tree/list/ctor/buildfile b/xsd-tests/cxx/tree/list/ctor/buildfile index f5722e2..adb6a13 100644 --- a/xsd-tests/cxx/tree/list/ctor/buildfile +++ b/xsd-tests/cxx/tree/list/ctor/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-default-ctor \ --generate-from-base-ctor \ diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile index 7ebafca..473d128 100644 --- a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile +++ b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/naming/camel/buildfile b/xsd-tests/cxx/tree/naming/camel/buildfile index 4573295..d93bd8e 100644 --- a/xsd-tests/cxx/tree/naming/camel/buildfile +++ b/xsd-tests/cxx/tree/naming/camel/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --type-naming ucc \ diff --git a/xsd-tests/cxx/tree/naming/java/buildfile b/xsd-tests/cxx/tree/naming/java/buildfile index a309894..b23f104 100644 --- a/xsd-tests/cxx/tree/naming/java/buildfile +++ b/xsd-tests/cxx/tree/naming/java/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --type-naming java \ diff --git a/xsd-tests/cxx/tree/naming/knr/buildfile b/xsd-tests/cxx/tree/naming/knr/buildfile index 9d86481..c694aa2 100644 --- a/xsd-tests/cxx/tree/naming/knr/buildfile +++ b/xsd-tests/cxx/tree/naming/knr/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --type-naming knr \ diff --git a/xsd-tests/cxx/tree/order/buildfile b/xsd-tests/cxx/tree/order/buildfile index 7ae4cec..b490676 100644 --- a/xsd-tests/cxx/tree/order/buildfile +++ b/xsd-tests/cxx/tree/order/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-wildcard \ diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile index a26182d..fc486ba 100644 --- a/xsd-tests/cxx/tree/polymorphism/comparison/buildfile +++ b/xsd-tests/cxx/tree/polymorphism/comparison/buildfile @@ -10,7 +10,7 @@ exe{driver}: xml{test}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-polymorphic \ diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile index cd1e510..fb9c4d0 100644 --- a/xsd-tests/cxx/tree/polymorphism/ostream/buildfile +++ b/xsd-tests/cxx/tree/polymorphism/ostream/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-polymorphic \ --polymorphic-type-all \ diff --git a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile index fba6da8..e739925 100644 --- a/xsd-tests/cxx/tree/polymorphism/same-type/buildfile +++ b/xsd-tests/cxx/tree/polymorphism/same-type/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-polymorphic \ --root-element root \ diff --git a/xsd-tests/cxx/tree/prefix/buildfile b/xsd-tests/cxx/tree/prefix/buildfile index 48fcd72..3ecd411 100644 --- a/xsd-tests/cxx/tree/prefix/buildfile +++ b/xsd-tests/cxx/tree/prefix/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx ixx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-polymorphic \ diff --git a/xsd-tests/cxx/tree/test-template/buildfile b/xsd-tests/cxx/tree/test-template/buildfile index 535893f..937840f 100644 --- a/xsd-tests/cxx/tree/test-template/buildfile +++ b/xsd-tests/cxx/tree/test-template/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/types-only/buildfile b/xsd-tests/cxx/tree/types-only/buildfile index 1a8a8d9..6436090 100644 --- a/xsd-tests/cxx/tree/types-only/buildfile +++ b/xsd-tests/cxx/tree/types-only/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --suppress-parsing \ --output-dir $out_base \ diff --git a/xsd-tests/cxx/tree/union/ctor/buildfile b/xsd-tests/cxx/tree/union/ctor/buildfile index 02a1241..e1dcb77 100644 --- a/xsd-tests/cxx/tree/union/ctor/buildfile +++ b/xsd-tests/cxx/tree/union/ctor/buildfile @@ -8,7 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-default-ctor \ --generate-from-base-ctor \ diff --git a/xsd-tests/cxx/tree/wildcard/buildfile b/xsd-tests/cxx/tree/wildcard/buildfile index 6430387..d936b0f 100644 --- a/xsd-tests/cxx/tree/wildcard/buildfile +++ b/xsd-tests/cxx/tree/wildcard/buildfile @@ -11,7 +11,7 @@ exe{driver}: file{output}: test.stdout = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-wildcard \ diff --git a/xsd-tests/failed/buildfile b/xsd-tests/failed/buildfile index 8c8db9f..a37056e 100644 --- a/xsd-tests/failed/buildfile +++ b/xsd-tests/failed/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/morphing/anonymous/attribute-group/buildfile b/xsd-tests/morphing/anonymous/attribute-group/buildfile index fb8e21c..38aa6d8 100644 --- a/xsd-tests/morphing/anonymous/attribute-group/buildfile +++ b/xsd-tests/morphing/anonymous/attribute-group/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/morphing/anonymous/basic/buildfile b/xsd-tests/morphing/anonymous/basic/buildfile index 21afec5..8193904 100644 --- a/xsd-tests/morphing/anonymous/basic/buildfile +++ b/xsd-tests/morphing/anonymous/basic/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile index 627faa8..15cbbe8 100644 --- a/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile +++ b/xsd-tests/morphing/anonymous/cyclic-inclusion/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/morphing/anonymous/group/buildfile b/xsd-tests/morphing/anonymous/group/buildfile index 5202deb..980dd19 100644 --- a/xsd-tests/morphing/anonymous/group/buildfile +++ b/xsd-tests/morphing/anonymous/group/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/morphing/anonymous/unstable/buildfile b/xsd-tests/morphing/anonymous/unstable/buildfile index a615205..d61d36b 100644 --- a/xsd-tests/morphing/anonymous/unstable/buildfile +++ b/xsd-tests/morphing/anonymous/unstable/buildfile @@ -11,7 +11,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) @@ -25,5 +25,5 @@ for f: $fs testscript{*}: { test = $xsd - test.arguments = cxx-tree --std c++11 + test.arguments = cxx-tree } diff --git a/xsd-tests/processing/inheritance/buildfile b/xsd-tests/processing/inheritance/buildfile index d478f4f..3dee900 100644 --- a/xsd-tests/processing/inheritance/buildfile +++ b/xsd-tests/processing/inheritance/buildfile @@ -24,7 +24,7 @@ for nm: 000 001 <{hxx cxx}{$sc}>: xsd{$sc} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/anonymous/buildfile b/xsd-tests/schema/anonymous/buildfile index ce236f8..060d7d6 100644 --- a/xsd-tests/schema/anonymous/buildfile +++ b/xsd-tests/schema/anonymous/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/any-attribute/buildfile b/xsd-tests/schema/any-attribute/buildfile index e4275a4..b215090 100644 --- a/xsd-tests/schema/any-attribute/buildfile +++ b/xsd-tests/schema/any-attribute/buildfile @@ -8,5 +8,5 @@ testscript{*}: { test = $xsd - test.arguments = cxx-tree --std c++11 + test.arguments = cxx-tree } diff --git a/xsd-tests/schema/any-type/buildfile b/xsd-tests/schema/any-type/buildfile index af74cd9..9ab1e7d 100644 --- a/xsd-tests/schema/any-type/buildfile +++ b/xsd-tests/schema/any-type/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) 2>>?~%EOE% diff --git a/xsd-tests/schema/any/buildfile b/xsd-tests/schema/any/buildfile index f5d6380..f6c163a 100644 --- a/xsd-tests/schema/any/buildfile +++ b/xsd-tests/schema/any/buildfile @@ -24,7 +24,7 @@ for sc: test fail <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) @@ -32,7 +32,7 @@ for sc: test fail <{hxx cxx}{fail}>: xsd{fail} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) 2>>?~%EOE% diff --git a/xsd-tests/schema/attribute-group/buildfile b/xsd-tests/schema/attribute-group/buildfile index 4c97e5b..4b7d27e 100644 --- a/xsd-tests/schema/attribute-group/buildfile +++ b/xsd-tests/schema/attribute-group/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -global} {hxx cxx}{global} $libs <{hxx cxx}{global}>: xsd{global} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/attribute/buildfile b/xsd-tests/schema/attribute/buildfile index a14bafc..30d1464 100644 --- a/xsd-tests/schema/attribute/buildfile +++ b/xsd-tests/schema/attribute/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/cardinality/buildfile b/xsd-tests/schema/cardinality/buildfile index 9b97cf0..93ad75a 100644 --- a/xsd-tests/schema/cardinality/buildfile +++ b/xsd-tests/schema/cardinality/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/chameleon/buildfile b/xsd-tests/schema/chameleon/buildfile index 445c052..e270cf0 100644 --- a/xsd-tests/schema/chameleon/buildfile +++ b/xsd-tests/schema/chameleon/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $directory($path($>[0])) \ $path($<[0]) diff --git a/xsd-tests/schema/enumeration/buildfile b/xsd-tests/schema/enumeration/buildfile index d8b2d85..5188b04 100644 --- a/xsd-tests/schema/enumeration/buildfile +++ b/xsd-tests/schema/enumeration/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/forward/buildfile b/xsd-tests/schema/forward/buildfile index ec6b7d9..3b30f53 100644 --- a/xsd-tests/schema/forward/buildfile +++ b/xsd-tests/schema/forward/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/group/buildfile b/xsd-tests/schema/group/buildfile index f2bb6e1..e93b592 100644 --- a/xsd-tests/schema/group/buildfile +++ b/xsd-tests/schema/group/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/import/buildfile b/xsd-tests/schema/import/buildfile index 4cec837..c5fab29 100644 --- a/xsd-tests/schema/import/buildfile +++ b/xsd-tests/schema/import/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $directory($path($>[0])) \ $path($<[0]) diff --git a/xsd-tests/schema/include/buildfile b/xsd-tests/schema/include/buildfile index dcc151a..c013903 100644 --- a/xsd-tests/schema/include/buildfile +++ b/xsd-tests/schema/include/buildfile @@ -15,7 +15,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $directory($path($>[0])) \ $path($<[0]) diff --git a/xsd-tests/schema/inheritance/buildfile b/xsd-tests/schema/inheritance/buildfile index 23786d3..0eae9b3 100644 --- a/xsd-tests/schema/inheritance/buildfile +++ b/xsd-tests/schema/inheritance/buildfile @@ -11,7 +11,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --output-dir $directory($path($>[0])) \ $path($<[0]) }} @@ -24,5 +24,5 @@ for f: $fs testscript{*}: { test = $xsd - test.arguments = cxx-tree --std c++11 + test.arguments = cxx-tree } diff --git a/xsd-tests/schema/list/buildfile b/xsd-tests/schema/list/buildfile index 88ed0ee..090e69a 100644 --- a/xsd-tests/schema/list/buildfile +++ b/xsd-tests/schema/list/buildfile @@ -11,7 +11,7 @@ for f: $fs { <{hxx cxx}{$f}>: xsd{$f} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $directory($path($>[0])) \ $path($<[0]) @@ -25,5 +25,5 @@ for f: $fs testscript{*}: { test = $xsd - test.arguments = cxx-tree --std c++11 + test.arguments = cxx-tree } diff --git a/xsd-tests/schema/no-namespace/buildfile b/xsd-tests/schema/no-namespace/buildfile index 5d50490..6723d4f 100644 --- a/xsd-tests/schema/no-namespace/buildfile +++ b/xsd-tests/schema/no-namespace/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/recursive/buildfile b/xsd-tests/schema/recursive/buildfile index 99788f6..a166e82 100644 --- a/xsd-tests/schema/recursive/buildfile +++ b/xsd-tests/schema/recursive/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/ref-type/invalid/buildfile b/xsd-tests/schema/ref-type/invalid/buildfile index 42c7bfb..aac448c 100644 --- a/xsd-tests/schema/ref-type/invalid/buildfile +++ b/xsd-tests/schema/ref-type/invalid/buildfile @@ -8,5 +8,5 @@ testscript{*}: { test = $xsd - test.arguments = cxx-tree --std c++11 + test.arguments = cxx-tree } diff --git a/xsd-tests/schema/ref-type/valid/buildfile b/xsd-tests/schema/ref-type/valid/buildfile index 2b27cf1..ff962dc 100644 --- a/xsd-tests/schema/ref-type/valid/buildfile +++ b/xsd-tests/schema/ref-type/valid/buildfile @@ -23,7 +23,7 @@ for sc: idref idrefs <{hxx cxx}{$sc}>: xsd{$sc} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/restriction/buildfile b/xsd-tests/schema/restriction/buildfile index b245187..314b095 100644 --- a/xsd-tests/schema/restriction/buildfile +++ b/xsd-tests/schema/restriction/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-tests/schema/union/buildfile b/xsd-tests/schema/union/buildfile index 9cdc56f..8ff9349 100644 --- a/xsd-tests/schema/union/buildfile +++ b/xsd-tests/schema/union/buildfile @@ -11,7 +11,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx cxx}{test} $libs <{hxx cxx}{test}>: xsd{test} $xsd {{ - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --root-element-all \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd/doc/cxx/parser/guide/index.xhtml.in b/xsd/doc/cxx/parser/guide/index.xhtml.in index 96d06e2..119f421 100644 --- a/xsd/doc/cxx/parser/guide/index.xhtml.in +++ b/xsd/doc/cxx/parser/guide/index.xhtml.in @@ -553,7 +553,7 @@ </p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --xml-parser expat hello.xsd +$ xsd cxx-parser --xml-parser expat hello.xsd </pre> <p>The <code>--xml-parser</code> option indicates that we want to @@ -1494,7 +1494,7 @@ gender ::gender ::gender; option to let the XSD compiler know about our type map:</p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --type-map people.map people.xsd +$ xsd cxx-parser --type-map people.map people.xsd </pre> <p>If we now look at the generated <code>people-pskel.hxx</code>, @@ -1673,10 +1673,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::[auto|unique]_ptr<xml_schema::buffer> - std::[auto|unique]_ptr<xml_schema::buffer>; - hexBinary std::[auto|unique]_ptr<xml_schema::buffer> - std::[auto|unique]_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; @@ -1742,8 +1742,7 @@ people ::people; recompile our schema and move on to implementing the parsers:</p> <pre class="terminal"> -$ xsd cxx-parser --std c++11 --xml-parser expat --type-map people.map \ - people.xsd +$ xsd cxx-parser --xml-parser expat --type-map people.map people.xsd </pre> <p>Here is the implementation of our three parsers in full. One @@ -2608,14 +2607,14 @@ private: <tr> <td><code>base64Binary</code></td> <td><code>base64_binary_pimpl</code></td> - <td><code>std::[auto|unique]_ptr< xml_schema::buffer></code><br/> + <td><code>std::[unique|auto]_ptr< xml_schema::buffer></code><br/> <a href="#6.3">Section 6.3, "<code>base64Binary</code> and <code>hexBinary</code> Parsers"</a></td> </tr> <tr> <td><code>hexBinary</code></td> <td><code>hex_binary_pimpl</code></td> - <td><code>std::[auto|unique]_ptr< xml_schema::buffer></code><br/> + <td><code>std::[unique|auto]_ptr< xml_schema::buffer></code><br/> <a href="#6.3">Section 6.3, "<code>base64Binary</code> and <code>hexBinary</code> Parsers"</a></td> </tr> diff --git a/xsd/doc/cxx/tree/guide/index.xhtml.in b/xsd/doc/cxx/tree/guide/index.xhtml.in index b704e50..2f7f1e2 100644 --- a/xsd/doc/cxx/tree/guide/index.xhtml.in +++ b/xsd/doc/cxx/tree/guide/index.xhtml.in @@ -536,7 +536,7 @@ </p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 hello.xsd +$ xsd cxx-tree hello.xsd </pre> <p>The XSD compiler produces two C++ files: <code>hello.hxx</code> and @@ -633,7 +633,7 @@ hello (std::istream&); select C++98:</p> <pre class="terminal"> -$ xsd cxx-tree hello.xsd +$ xsd cxx-tree --std c++98 hello.xsd </pre> <p>Then the parsing function signatures will become:</p> @@ -726,7 +726,7 @@ Hello, world! it with the <code>--generate-serialization</code> options:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --generate-serialization hello.xsd +$ xsd cxx-tree --generate-serialization hello.xsd </pre> <p>If we now examine the generated <code>hello.hxx</code> file, @@ -911,7 +911,7 @@ main (int argc, char* argv[]) change the type naming scheme:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --type-naming ucc hello.xsd +$ xsd cxx-tree --type-naming ucc hello.xsd </pre> <p>The <code>ucc</code> argument to the <code>--type-naming</code> @@ -978,8 +978,7 @@ hello (std::istream&); <code>--type-regex</code> option:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --type-naming ucc \ - --type-regex '/ (.+)_t/\u$1/' hello.xsd +$ xsd cxx-tree --type-naming ucc --type-regex '/ (.+)_t/\u$1/' hello.xsd </pre> <p>This results in the following changes to the generated code:</p> @@ -1114,8 +1113,7 @@ hello (std::istream&); our schema with the <code>--generate-doxygen</code> option:</p> <pre class="terminal"> -$ xsd cxx-tree --std c++11 --generate-serialization --generate-doxygen \ - hello.xsd +$ xsd cxx-tree --generate-serialization --generate-doxygen hello.xsd </pre> <p>Now the generated <code>hello.hxx</code> file contains comments diff --git a/xsd/doc/pregenerated/xsd.1 b/xsd/doc/pregenerated/xsd.1 index 7d2727f..0cf4f6f 100644 --- a/xsd/doc/pregenerated/xsd.1 +++ b/xsd/doc/pregenerated/xsd.1 @@ -119,12 +119,15 @@ if any, should appear after the corresponding . .IP "\fB--std\fR \fIversion\fR" Specify the C++ standard that the generated code should conform to\. Valid -values are \fBc++98\fR (default) and \fBc++11\fR\. +values are \fBc++98\fR, \fBc++11\fR (default), \fBc++14\fR, \fBc++17\fR, +\fBc++20\fR, and \fBc++23\fR\. The C++ standard affects various aspects of the generated code that are discussed in more detail in various mapping-specific documentation\. Overall, when C++11 is selected, the generated code relies on the move semantics and uses \fBstd::unique_ptr\fR instead of deprecated \fBstd::auto_ptr\fR\. +Currently, there is no difference between the C++11 and the later standards +modes\. When the C++11 mode is selected, you normally don't need to perform any extra steps other than enable C++11 in your C++ compiler, if required\. The XSD @@ -1292,7 +1295,6 @@ namespace http://www.example.com/xmlns/my .br .RE - The compiler has a number of predefined mapping rules that can be presented as the following map files. The string-based XML Schema built-in types are mapped to either @@ -1303,6 +1305,14 @@ depending on the character type selected with the .B --char-type option .RB ( char +by default). The binary XML Schema types are mapped to either +.B std::unique_ptr<xml_schema::buffer> +or +.B std::auto_ptr<xml_schema::buffer> +depending on the C++ standard selected with the +.B --std +option +.RB ( c++11 by default). .RS @@ -1382,13 +1392,13 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; .br - base64Binary std::auto_ptr<xml_schema::buffer> + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br - hexBinary std::auto_ptr<xml_schema::buffer> + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br date xml_schema::date; diff --git a/xsd/doc/pregenerated/xsd.xhtml b/xsd/doc/pregenerated/xsd.xhtml index d7d1ee3..ae90b41 100644 --- a/xsd/doc/pregenerated/xsd.xhtml +++ b/xsd/doc/pregenerated/xsd.xhtml @@ -124,14 +124,16 @@ <dl class="options"> <dt><code><b>--std</b></code> <code><i>version</i></code></dt> <dd>Specify the C++ standard that the generated code should conform to. - Valid values are <code><b>c++98</b></code> (default) and - <code><b>c++11</b></code>. + Valid values are <code><b>c++98</b></code>, <code><b>c++11</b></code> + (default), <code><b>c++14</b></code>, <code><b>c++17</b></code>, + <code><b>c++20</b></code>, and <code><b>c++23</b></code>. <p>The C++ standard affects various aspects of the generated code that are discussed in more detail in various mapping-specific documentation. Overall, when C++11 is selected, the generated code relies on the move semantics and uses <code><b>std::unique_ptr</b></code> instead of - deprecated <code><b>std::auto_ptr</b></code>.</p> + deprecated <code><b>std::auto_ptr</b></code>. Currently, there is no + difference between the C++11 and the later standards modes.</p> <p>When the C++11 mode is selected, you normally don't need to perform any extra steps other than enable C++11 in your C++ compiler, if required. The @@ -1465,7 +1467,11 @@ namespace http://www.example.com/xmlns/my built-in types are mapped to either <code><b>std::string</b></code> or <code><b>std::wstring</b></code> depending on the character type selected with the <code><b>--char-type</b></code> option - (<code><b>char</b></code> by default).</p> + (<code><b>char</b></code> by default). The binary XML Schema types are + mapped to either <code>std::unique_ptr<xml_schema::buffer></code> + or <code>std::auto_ptr<xml_schema::buffer></code> depending on the C++ + standard selected with the <code><b>--std</b></code> option + (<code><b>c++11</b></code> by default).</p> <pre> namespace http://www.w3.org/2001/XMLSchema @@ -1512,10 +1518,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; - hexBinary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; diff --git a/xsd/doc/xsd-epilogue.1 b/xsd/doc/xsd-epilogue.1 index a37da89..9ab1952 100644 --- a/xsd/doc/xsd-epilogue.1 +++ b/xsd/doc/xsd-epilogue.1 @@ -381,7 +381,6 @@ namespace http://www.example.com/xmlns/my .br .RE - The compiler has a number of predefined mapping rules that can be presented as the following map files. The string-based XML Schema built-in types are mapped to either @@ -392,6 +391,14 @@ depending on the character type selected with the .B --char-type option .RB ( char +by default). The binary XML Schema types are mapped to either +.B std::unique_ptr<xml_schema::buffer> +or +.B std::auto_ptr<xml_schema::buffer> +depending on the C++ standard selected with the +.B --std +option +.RB ( c++11 by default). .RS @@ -471,13 +478,13 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; .br - base64Binary std::auto_ptr<xml_schema::buffer> + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br - hexBinary std::auto_ptr<xml_schema::buffer> + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> .br - std::auto_ptr<xml_schema::buffer>; + std::[unique|auto]_ptr<xml_schema::buffer>; .br date xml_schema::date; diff --git a/xsd/doc/xsd-epilogue.xhtml b/xsd/doc/xsd-epilogue.xhtml index 632b2d9..178cf8b 100644 --- a/xsd/doc/xsd-epilogue.xhtml +++ b/xsd/doc/xsd-epilogue.xhtml @@ -290,7 +290,11 @@ namespace http://www.example.com/xmlns/my built-in types are mapped to either <code><b>std::string</b></code> or <code><b>std::wstring</b></code> depending on the character type selected with the <code><b>--char-type</b></code> option - (<code><b>char</b></code> by default).</p> + (<code><b>char</b></code> by default). The binary XML Schema types are + mapped to either <code>std::unique_ptr<xml_schema::buffer></code> + or <code>std::auto_ptr<xml_schema::buffer></code> depending on the C++ + standard selected with the <code><b>--std</b></code> option + (<code><b>c++11</b></code> by default).</p> <pre> namespace http://www.w3.org/2001/XMLSchema @@ -337,10 +341,10 @@ namespace http://www.w3.org/2001/XMLSchema QName xml_schema::qname; - base64Binary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; - hexBinary std::auto_ptr<xml_schema::buffer> - std::auto_ptr<xml_schema::buffer>; + base64Binary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; + hexBinary std::[unique|auto]_ptr<xml_schema::buffer> + std::[unique|auto]_ptr<xml_schema::buffer>; date xml_schema::date; dateTime xml_schema::date_time; diff --git a/xsd/xsd/cxx/option-types.cxx b/xsd/xsd/cxx/option-types.cxx index ad8a3c9..8744d7f 100644 --- a/xsd/xsd/cxx/option-types.cxx +++ b/xsd/xsd/cxx/option-types.cxx @@ -17,7 +17,11 @@ namespace CXX static const char* cxx_version_[] = { "c++98", - "c++11" + "c++11", + "c++14", + "c++17", + "c++20", + "c++23", }; string cxx_version:: @@ -38,6 +42,14 @@ namespace CXX v = cxx_version::cxx98; else if (s == "c++11") v = cxx_version::cxx11; + else if (s == "c++14") + v = cxx_version::cxx14; + else if (s == "c++17") + v = cxx_version::cxx17; + else if (s == "c++20") + v = cxx_version::cxx20; + else if (s == "c++23") + v = cxx_version::cxx23; else is.setstate (istream::failbit); } diff --git a/xsd/xsd/cxx/option-types.hxx b/xsd/xsd/cxx/option-types.hxx index bbb15b3..98a493a 100644 --- a/xsd/xsd/cxx/option-types.hxx +++ b/xsd/xsd/cxx/option-types.hxx @@ -14,10 +14,14 @@ namespace CXX enum value { cxx98, - cxx11 + cxx11, + cxx14, + cxx17, + cxx20, + cxx23 }; - cxx_version (value v = value (0)) : v_ (v) {} + cxx_version (value v) : v_ (v) {} operator value () const {return v_;} std::string diff --git a/xsd/xsd/cxx/options.cli b/xsd/xsd/cxx/options.cli index 2c50f19..1eb1b61 100644 --- a/xsd/xsd/cxx/options.cli +++ b/xsd/xsd/cxx/options.cli @@ -15,17 +15,19 @@ namespace CXX { // Language. // - cxx_version --std = cxx_version::cxx98 + cxx_version --std = cxx_version::cxx11 { "<version>", "Specify the C++ standard that the generated code should conform to. - Valid values are \cb{c++98} (default) and \cb{c++11}. + Valid values are \cb{c++98}, \cb{c++11} (default), \cb{c++14}, + \cb{c++17}, \cb{c++20}, and \cb{c++23}. The C++ standard affects various aspects of the generated code that are discussed in more detail in various mapping-specific documentation. Overall, when C++11 is selected, the generated code relies on the move semantics and uses \cb{std::unique_ptr} - instead of deprecated \cb{std::auto_ptr}. + instead of deprecated \cb{std::auto_ptr}. Currently, there is no + difference between the C++11 and the later standards modes. When the C++11 mode is selected, you normally don't need to perform any extra steps other than enable C++11 in your C++ diff --git a/xsd/xsd/pregenerated/xsd/cxx/options.cxx b/xsd/xsd/pregenerated/xsd/cxx/options.cxx index 24532f5..4d4fa23 100644 --- a/xsd/xsd/pregenerated/xsd/cxx/options.cxx +++ b/xsd/xsd/pregenerated/xsd/cxx/options.cxx @@ -266,7 +266,7 @@ namespace CXX options:: options () - : std_ (cxx_version::cxx98), + : std_ (cxx_version::cxx11), std_specified_ (false), char_type_ ("char"), char_type_specified_ (false), |