Initial modularization with both Clang and VC hacks

Note: gave up on VC about half way though.

1 files changed, 18 insertions, 4 deletions

diff --git a/tests/standard-version/driver.cxx b/tests/standard-version/driver.cxx
index fa149ae..c6f9c11 100644
--- a/tests/standard-version/driver.cxx
+++ b/tests/standard-version/driver.cxx
@@ -2,14 +2,28 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
+#include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <ios>       // ios::failbit, ios::badbit
 #include <string>
-#include <cassert>
 #include <iostream>
 #include <stdexcept> // invalid_argument
-
-#include <libbutl/utility.hxx>          // operator<<(ostream,exception)
-#include <libbutl/standard-version.hxx>
+#endif
+
+// Other includes.
+
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.utility;          // operator<<(ostream,exception)
+import butl.standard_version;
+#else
+#include <libbutl/utility.mxx>
+#include <libbutl/standard-version.mxx>
+#endif
 
 using namespace std;
 using namespace butl;