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.

53 files changed, 53 insertions, 53 deletions

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       \