4 files changed, 8 insertions, 6 deletions
diff --git a/xsd-tests/cxx/tree/default/general/buildfile b/xsd-tests/cxx/tree/default/general/buildfile
index 4e482ce..7ccc174 100644
--- a/xsd-tests/cxx/tree/default/general/buildfile
+++ b/xsd-tests/cxx/tree/default/general/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11      \
+  $xsd cxx-tree                  \
        --generate-inline         \
        --generate-serialization  \
        --generate-ostream        \
diff --git a/xsd-tests/cxx/tree/default/general/driver.cxx b/xsd-tests/cxx/tree/default/general/driver.cxx
index 7031636..f15a0c7 100644
--- a/xsd-tests/cxx/tree/default/general/driver.cxx
+++ b/xsd-tests/cxx/tree/default/general/driver.cxx
@@ -9,6 +9,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/default/omit/buildfile b/xsd-tests/cxx/tree/default/omit/buildfile
index 407ab1e..ee6d678 100644
--- a/xsd-tests/cxx/tree/default/omit/buildfile
+++ b/xsd-tests/cxx/tree/default/omit/buildfile
@@ -11,9 +11,7 @@ exe{driver}: file{output}: test.stdout = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11      \
+  $xsd cxx-tree                  \
        --generate-inline         \
        --generate-serialization  \
        --generate-ostream        \
diff --git a/xsd-tests/cxx/tree/default/omit/driver.cxx b/xsd-tests/cxx/tree/default/omit/driver.cxx
index 3dcc0d8..c7d32c9 100644
--- a/xsd-tests/cxx/tree/default/omit/driver.cxx
+++ b/xsd-tests/cxx/tree/default/omit/driver.cxx
@@ -9,6 +9,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;