6 files changed, 12 insertions, 9 deletions
diff --git a/xsd-tests/cxx/tree/naming/camel/buildfile b/xsd-tests/cxx/tree/naming/camel/buildfile
index 8a8410c..d93bd8e 100644
--- a/xsd-tests/cxx/tree/naming/camel/buildfile
+++ b/xsd-tests/cxx/tree/naming/camel/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11     \
+  $xsd cxx-tree                 \
        --generate-inline        \
        --generate-serialization \
        --type-naming ucc        \
diff --git a/xsd-tests/cxx/tree/naming/camel/driver.cxx b/xsd-tests/cxx/tree/naming/camel/driver.cxx
index 600b3ff..82dddba 100644
--- a/xsd-tests/cxx/tree/naming/camel/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/camel/driver.cxx
@@ -11,6 +11,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/naming/java/buildfile b/xsd-tests/cxx/tree/naming/java/buildfile
index 5d4b447..b23f104 100644
--- a/xsd-tests/cxx/tree/naming/java/buildfile
+++ b/xsd-tests/cxx/tree/naming/java/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11     \
+  $xsd cxx-tree                 \
        --generate-inline        \
        --generate-serialization \
        --type-naming java       \
diff --git a/xsd-tests/cxx/tree/naming/java/driver.cxx b/xsd-tests/cxx/tree/naming/java/driver.cxx
index b47ff74..4738296 100644
--- a/xsd-tests/cxx/tree/naming/java/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/java/driver.cxx
@@ -11,6 +11,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/naming/knr/buildfile b/xsd-tests/cxx/tree/naming/knr/buildfile
index c4c2287..c694aa2 100644
--- a/xsd-tests/cxx/tree/naming/knr/buildfile
+++ b/xsd-tests/cxx/tree/naming/knr/buildfile
@@ -8,9 +8,7 @@ exe{driver}: {hxx cxx}{* -test} {hxx ixx cxx}{test} $libs
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11     \
+  $xsd cxx-tree                 \
        --generate-inline        \
        --generate-serialization \
        --type-naming knr        \
diff --git a/xsd-tests/cxx/tree/naming/knr/driver.cxx b/xsd-tests/cxx/tree/naming/knr/driver.cxx
index 8c75dd9..f959a20 100644
--- a/xsd-tests/cxx/tree/naming/knr/driver.cxx
+++ b/xsd-tests/cxx/tree/naming/knr/driver.cxx
@@ -11,6 +11,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;