2 files changed, 4 insertions, 3 deletions
diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile b/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
index 530c42f..473d128 100644
--- a/xsd-tests/cxx/tree/name-clash/inheritance/buildfile
+++ b/xsd-tests/cxx/tree/name-clash/inheritance/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-ostream     \
        --output-dir $out_base \
diff --git a/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx b/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
index 634c56a..ae0d337 100644
--- a/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
+++ b/xsd-tests/cxx/tree/name-clash/inheritance/driver.cxx
@@ -9,6 +9,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;