17 files changed, 17 insertions, 51 deletions
diff --git a/xsd-tests/cxx/parser/built-in/buildfile b/xsd-tests/cxx/parser/built-in/buildfile
index 0522c9a..13ae128 100644
--- a/xsd-tests/cxx/parser/built-in/buildfile
+++ b/xsd-tests/cxx/parser/built-in/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/enumeration/buildfile b/xsd-tests/cxx/parser/enumeration/buildfile
index 05163df..fe5933a 100644
--- a/xsd-tests/cxx/parser/enumeration/buildfile
+++ b/xsd-tests/cxx/parser/enumeration/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} map{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/generated-impl/buildfile b/xsd-tests/cxx/parser/generated-impl/buildfile
index 8710a77..f6932f9 100644
--- a/xsd-tests/cxx/parser/generated-impl/buildfile
+++ b/xsd-tests/cxx/parser/generated-impl/buildfile
@@ -16,9 +16,7 @@ exe{driver}: file{output}: test.stdout = true
  {hxx     cxx}{test-pimpl}                   \
  {        cxx}{test-driver}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --generate-print-impl     \
diff --git a/xsd-tests/cxx/parser/list/buildfile b/xsd-tests/cxx/parser/list/buildfile
index 426101e..5f44a93 100644
--- a/xsd-tests/cxx/parser/list/buildfile
+++ b/xsd-tests/cxx/parser/list/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
index 4bd7b48..d6065be 100644
--- a/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/parser/name-clash/inheritance/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
index 629645b..02b1b41 100644
--- a/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/recursive/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
index d98e917..4303002 100644
--- a/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
+++ b/xsd-tests/cxx/parser/polymorphism/same-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/recursive/buildfile b/xsd-tests/cxx/parser/recursive/buildfile
index 237855c..395908e 100644
--- a/xsd-tests/cxx/parser/recursive/buildfile
+++ b/xsd-tests/cxx/parser/recursive/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/test-template/buildfile b/xsd-tests/cxx/parser/test-template/buildfile
index 9f7f5d3..aad21e7 100644
--- a/xsd-tests/cxx/parser/test-template/buildfile
+++ b/xsd-tests/cxx/parser/test-template/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/union/buildfile b/xsd-tests/cxx/parser/union/buildfile
index 1a8615c..6694d5f 100644
--- a/xsd-tests/cxx/parser/union/buildfile
+++ b/xsd-tests/cxx/parser/union/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/all/buildfile b/xsd-tests/cxx/parser/validation/all/buildfile
index 555843e..e9c0550 100644
--- a/xsd-tests/cxx/parser/validation/all/buildfile
+++ b/xsd-tests/cxx/parser/validation/all/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/any/buildfile b/xsd-tests/cxx/parser/validation/any/buildfile
index 57135f4..9867f51 100644
--- a/xsd-tests/cxx/parser/validation/any/buildfile
+++ b/xsd-tests/cxx/parser/validation/any/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/attribute/buildfile b/xsd-tests/cxx/parser/validation/attribute/buildfile
index d486193..0dfe365 100644
--- a/xsd-tests/cxx/parser/validation/attribute/buildfile
+++ b/xsd-tests/cxx/parser/validation/attribute/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
index a6f366b..8efcacc 100644
--- a/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
+++ b/xsd-tests/cxx/parser/validation/built-in/any-type/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/choice/buildfile b/xsd-tests/cxx/parser/validation/choice/buildfile
index adf0832..06eca85 100644
--- a/xsd-tests/cxx/parser/validation/choice/buildfile
+++ b/xsd-tests/cxx/parser/validation/choice/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/restriction/buildfile b/xsd-tests/cxx/parser/validation/restriction/buildfile
index 4c415bf..1086ea0 100644
--- a/xsd-tests/cxx/parser/validation/restriction/buildfile
+++ b/xsd-tests/cxx/parser/validation/restriction/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \
diff --git a/xsd-tests/cxx/parser/validation/sequence/buildfile b/xsd-tests/cxx/parser/validation/sequence/buildfile
index b205091..2ca2b6a 100644
--- a/xsd-tests/cxx/parser/validation/sequence/buildfile
+++ b/xsd-tests/cxx/parser/validation/sequence/buildfile
@@ -9,9 +9,7 @@ exe{driver}: {hxx cxx}{* -test-pskel} {hxx ixx cxx}{test-pskel} $libs \
 
 <{hxx ixx cxx}{test-pskel}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-parser --std c++11    \
+  $xsd cxx-parser                \
        --generate-inline         \
        --skel-file-suffix -pskel \
        --output-dir $out_base    \