1 files changed, 9 insertions, 22 deletions
diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx
index 4b985e1..4bddf08 100644
--- a/tests/standard-version/driver.cxx
+++ b/tests/standard-version/driver.cxx
@@ -1,31 +1,18 @@
 // file      : tests/standard-version/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
 #include <ios>       // ios::failbit, ios::badbit
 #include <string>
 #include <cstdint>   // uint*_t
 #include <iostream>
 #include <stdexcept> // invalid_argument
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.utility;          // operator<<(ostream,exception), eof()
-import butl.optional;
-import butl.standard_version;
-#else
-#include <libbutl/utility.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/standard-version.mxx>
-#endif
+
+#include <libbutl/utility.hxx>          // operator<<(ostream,exception), eof()
+#include <libbutl/optional.hxx>
+#include <libbutl/standard-version.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace butl;
@@ -96,7 +83,7 @@ version (const string& s,
 
       if (v.minor () != 99999)
       {
-        standard_version_constraint c1 ("~" + s);
+        standard_version_constraint c1 ('~' + s);
         standard_version_constraint c2 ('[' + s + ' ' + max_ver ('~') + ')');
         assert (c1 == c2);
       }
@@ -104,7 +91,7 @@ version (const string& s,
       if ((v.major () == 0 && v.minor () != 99999) ||
           (v.major () != 0 && v.major () != 99999))
       {
-        standard_version_constraint c1 ("^" + s);
+        standard_version_constraint c1 ('^' + s);
         standard_version_constraint c2 ('[' + s + ' ' + max_ver ('^') + ')');
         assert (c1 == c2);
       }