Fortify tests against NDEBUG

37 files changed, 111 insertions, 10 deletions

diff --git a/xsd-tests/cxx/tree/any-type/driver.cxx b/xsd-tests/cxx/tree/any-type/driver.cxx
index a8fccf6..8ed00c7 100644
--- a/xsd-tests/cxx/tree/any-type/driver.cxx
+++ b/xsd-tests/cxx/tree/any-type/driver.cxx
@@ -16,6 +16,9 @@
 
 #include <xsd/cxx/xml/string.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 using namespace xercesc;
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/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/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/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;
 
diff --git a/xsd-tests/cxx/tree/built-in/driver.cxx b/xsd-tests/cxx/tree/built-in/driver.cxx
index 4141290..ccb43ac 100644
--- a/xsd-tests/cxx/tree/built-in/driver.cxx
+++ b/xsd-tests/cxx/tree/built-in/driver.cxx
@@ -8,9 +8,11 @@
 #include <sstream>
 #include <iostream>
 
-
 #include "types.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using std::cerr;
 using std::endl;
 
diff --git a/xsd-tests/cxx/tree/chameleon/driver.cxx b/xsd-tests/cxx/tree/chameleon/driver.cxx
index c22ca55..0d95864 100644
--- a/xsd-tests/cxx/tree/chameleon/driver.cxx
+++ b/xsd-tests/cxx/tree/chameleon/driver.cxx
@@ -9,6 +9,9 @@
 
 #include "includer.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/comparison/driver.cxx b/xsd-tests/cxx/tree/comparison/driver.cxx
index aa7b66d..36b0647 100644
--- a/xsd-tests/cxx/tree/comparison/driver.cxx
+++ b/xsd-tests/cxx/tree/comparison/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/compilation/driver.cxx b/xsd-tests/cxx/tree/compilation/driver.cxx
index 5c5ab39..818cb6b 100644
--- a/xsd-tests/cxx/tree/compilation/driver.cxx
+++ b/xsd-tests/cxx/tree/compilation/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/complex/ctor/driver.cxx b/xsd-tests/cxx/tree/complex/ctor/driver.cxx
index 7beaa93..7cc25bb 100644
--- a/xsd-tests/cxx/tree/complex/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/complex/ctor/driver.cxx
@@ -4,7 +4,6 @@
 // Test generation of varous complex type constructors.
 //
 
-#include <cassert>
 #include <memory>
 
 #include "test.hxx"
@@ -16,6 +15,9 @@
 #  define XSD_MOVE(x) x
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/containment/driver.cxx b/xsd-tests/cxx/tree/containment/driver.cxx
index 65c17fc..db8db72 100644
--- a/xsd-tests/cxx/tree/containment/driver.cxx
+++ b/xsd-tests/cxx/tree/containment/driver.cxx
@@ -5,7 +5,6 @@
 //
 
 #include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
 
 #include "test.hxx"
 
@@ -16,6 +15,9 @@
 #  define XSD_MOVE(x) x
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
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/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;
 
diff --git a/xsd-tests/cxx/tree/detach/driver.cxx b/xsd-tests/cxx/tree/detach/driver.cxx
index b632b5d..1d7e1f9 100644
--- a/xsd-tests/cxx/tree/detach/driver.cxx
+++ b/xsd-tests/cxx/tree/detach/driver.cxx
@@ -5,7 +5,6 @@
 //
 
 #include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
 
 #include "test.hxx"
 
@@ -16,6 +15,9 @@
 #  define XSD_MOVE(x) x
 #endif
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/dom-association/dom-parse.cxx b/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
index 281eb2c..a14b8e9 100644
--- a/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
+++ b/xsd-tests/cxx/tree/dom-association/dom-parse.cxx
@@ -15,6 +15,9 @@
 #include <xsd/cxx/tree/exceptions.hxx>
 #include <xsd/cxx/tree/error-handler.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace xercesc;
 namespace xml = xsd::cxx::xml;
 namespace tree = xsd::cxx::tree;
diff --git a/xsd-tests/cxx/tree/dom-association/driver.cxx b/xsd-tests/cxx/tree/dom-association/driver.cxx
index d85e105..2470212 100644
--- a/xsd-tests/cxx/tree/dom-association/driver.cxx
+++ b/xsd-tests/cxx/tree/dom-association/driver.cxx
@@ -13,6 +13,9 @@
 #include "dom-parse.hxx"
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 using namespace xercesc;
diff --git a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
index e356815..9d92c12 100644
--- a/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/iso-8859-1/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx b/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx
index 97c0875..54f99e6 100644
--- a/xsd-tests/cxx/tree/encoding/char/lcp/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/lcp/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/encoding/char/utf-8/driver.cxx b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
index 7892667..7f83d2b 100644
--- a/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/char/utf-8/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
index dbcbcba..f4e7993 100644
--- a/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
+++ b/xsd-tests/cxx/tree/encoding/wchar/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
index c5ea1f2..3ea4a28 100644
--- a/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/enumeration/ctor/driver.cxx
@@ -7,6 +7,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx b/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx
index b517b1f..d2494c0 100644
--- a/xsd-tests/cxx/tree/enumeration/inheritance/driver.cxx
+++ b/xsd-tests/cxx/tree/enumeration/inheritance/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/float/driver.cxx b/xsd-tests/cxx/tree/float/driver.cxx
index 0f7455f..b4409ad 100644
--- a/xsd-tests/cxx/tree/float/driver.cxx
+++ b/xsd-tests/cxx/tree/float/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/list/ctor/driver.cxx b/xsd-tests/cxx/tree/list/ctor/driver.cxx
index 5673e67..f821cdd 100644
--- a/xsd-tests/cxx/tree/list/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/list/ctor/driver.cxx
@@ -7,6 +7,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
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;
 
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/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/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;
 
diff --git a/xsd-tests/cxx/tree/order/driver.cxx b/xsd-tests/cxx/tree/order/driver.cxx
index f1902ba..46a0065 100644
--- a/xsd-tests/cxx/tree/order/driver.cxx
+++ b/xsd-tests/cxx/tree/order/driver.cxx
@@ -5,7 +5,6 @@
 //
 
 #include <memory> // std::auto_ptr/unique_ptr
-#include <cassert>
 #include <iostream>
 
 #include <xercesc/dom/DOM.hpp>
@@ -13,6 +12,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 using namespace xercesc;
diff --git a/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
index cadb225..502fa3c 100644
--- a/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/comparison/driver.cxx
@@ -10,6 +10,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx b/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx
index b030be9..8754ac0 100644
--- a/xsd-tests/cxx/tree/polymorphism/ostream/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/ostream/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/polymorphism/same-type/driver.cxx b/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx
index 94f82f5..bebd0a1 100644
--- a/xsd-tests/cxx/tree/polymorphism/same-type/driver.cxx
+++ b/xsd-tests/cxx/tree/polymorphism/same-type/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/prefix/driver.cxx b/xsd-tests/cxx/tree/prefix/driver.cxx
index bd2e46d..4eadf96 100644
--- a/xsd-tests/cxx/tree/prefix/driver.cxx
+++ b/xsd-tests/cxx/tree/prefix/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/test-template/driver.cxx b/xsd-tests/cxx/tree/test-template/driver.cxx
index 5257279..69c1ed9 100644
--- a/xsd-tests/cxx/tree/test-template/driver.cxx
+++ b/xsd-tests/cxx/tree/test-template/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/types-only/driver.cxx b/xsd-tests/cxx/tree/types-only/driver.cxx
index 730b807..f9cce83 100644
--- a/xsd-tests/cxx/tree/types-only/driver.cxx
+++ b/xsd-tests/cxx/tree/types-only/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/union/ctor/driver.cxx b/xsd-tests/cxx/tree/union/ctor/driver.cxx
index 246eea8..20d03ad 100644
--- a/xsd-tests/cxx/tree/union/ctor/driver.cxx
+++ b/xsd-tests/cxx/tree/union/ctor/driver.cxx
@@ -7,6 +7,9 @@
 
 #include "test.hxx"
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 
diff --git a/xsd-tests/cxx/tree/wildcard/driver.cxx b/xsd-tests/cxx/tree/wildcard/driver.cxx
index e3040c7..2847391 100644
--- a/xsd-tests/cxx/tree/wildcard/driver.cxx
+++ b/xsd-tests/cxx/tree/wildcard/driver.cxx
@@ -15,6 +15,9 @@
 
 #include <xsd/cxx/xml/string.hxx>
 
+#undef NDEBUG
+#include <cassert>
+
 using namespace std;
 using namespace test;
 using namespace xercesc;