From c09cd7512491cee1e82c1ad8128ce9fd4bc3f79b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 22 Sep 2017 23:32:28 +0200
Subject: Initial modularization with both Clang and VC hacks

Note: gave up on VC about half way though.
---
 tests/wildcard/driver.cxx | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

(limited to 'tests/wildcard/driver.cxx')

diff --git a/tests/wildcard/driver.cxx b/tests/wildcard/driver.cxx
index 502726f..d95d7cd 100644
--- a/tests/wildcard/driver.cxx
+++ b/tests/wildcard/driver.cxx
@@ -2,18 +2,34 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
+#include <cassert>
+
+#ifndef __cpp_lib_modules
 #include <map>
 #include <string>
 #include <vector>
-#include <cassert>
-#include <iostream>
 #include <algorithm> // sort()
 #include <exception>
+#include <iostream>
+#endif
+
+// Other includes.
 
-#include <libbutl/path.hxx>
-#include <libbutl/utility.hxx>    // operator<<(ostream, exception)
-#include <libbutl/optional.hxx>
-#include <libbutl/filesystem.hxx>
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.path;
+import butl.utility;    // operator<<(ostream, exception)
+import butl.optional;
+import butl.filesystem;
+#else
+#include <libbutl/path.mxx>
+#include <libbutl/utility.mxx>
+#include <libbutl/optional.mxx>
+#include <libbutl/filesystem.mxx>
+#endif
 
 using namespace std;
 using namespace butl;
-- 
cgit v1.1