8 files changed, 16 insertions, 16 deletions
diff --git a/xsd-tests/cxx/tree/binary/cdr/buildfile b/xsd-tests/cxx/tree/binary/cdr/buildfile
index 7a1c5b4..7518f04 100644
--- a/xsd-tests/cxx/tree/binary/cdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/cdr/buildfile
@@ -11,9 +11,7 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $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/cdr/driver.cxx b/xsd-tests/cxx/tree/binary/cdr/driver.cxx
index fe74bb5..4656b03 100644
--- a/xsd-tests/cxx/tree/binary/cdr/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/cdr/driver.cxx
@@ -5,11 +5,13 @@
 //
 
 #include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
 #include <iostream>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/binary/polymorphic/buildfile b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
index d34ef27..1212a34 100644
--- a/xsd-tests/cxx/tree/binary/polymorphic/buildfile
+++ b/xsd-tests/cxx/tree/binary/polymorphic/buildfile
@@ -11,9 +11,7 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $xsd cxx-tree --std c++11                 \
+  $xsd cxx-tree                             \
        --generate-inline                    \
        --generate-polymorphic               \
        --root-element-last                  \
diff --git a/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx b/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
index 15ebf17..ebc0dba 100644
--- a/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/polymorphic/driver.cxx
@@ -5,7 +5,6 @@
 //
 
 #include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
 #include <iostream>
 #include <typeinfo>
 
@@ -13,6 +12,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
index 09414c7..93e1701 100644
--- a/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr-ordered/buildfile
@@ -13,9 +13,7 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $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-ordered/driver.cxx b/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
index d61a645..46a2e1f 100644
--- a/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/xdr-ordered/driver.cxx
@@ -8,11 +8,13 @@
 
 #include <memory>  // std::auto_ptr/unique_ptr
 #include <cstring> // std::memcpy
-#include <cassert>
 #include <iostream>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/binary/xdr/buildfile b/xsd-tests/cxx/tree/binary/xdr/buildfile
index b8fc2f4..0c738f6 100644
--- a/xsd-tests/cxx/tree/binary/xdr/buildfile
+++ b/xsd-tests/cxx/tree/binary/xdr/buildfile
@@ -13,9 +13,7 @@ exe{driver}: xml{test}: test.input = true
 
 <{hxx ixx cxx}{test}>: xsd{test} $xsd
 {{
-  diag xsd ($<[0]) # @@ TMP
-
-  $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/driver.cxx b/xsd-tests/cxx/tree/binary/xdr/driver.cxx
index 04606ea..a497d73 100644
--- a/xsd-tests/cxx/tree/binary/xdr/driver.cxx
+++ b/xsd-tests/cxx/tree/binary/xdr/driver.cxx
@@ -6,11 +6,13 @@
 
 #include <memory>  // std::auto_ptr/unique_ptr
 #include <cstring> // std::memcpy
-#include <cassert>
 #include <iostream>
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;