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.
---
 libbutl/utility.cxx | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'libbutl/utility.cxx')

diff --git a/libbutl/utility.cxx b/libbutl/utility.cxx
index 8ce2cbc..c8e4e85 100644
--- a/libbutl/utility.cxx
+++ b/libbutl/utility.cxx
@@ -2,15 +2,39 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <libbutl/utility.hxx>
+#ifndef __cpp_modules
+#include <libbutl/utility.mxx>
+#endif
 
 #ifdef _WIN32
-#  include <libbutl/win32-utility.hxx>
+#include <libbutl/win32-utility.hxx>
 #endif
 
+#ifndef __cpp_lib_modules
 #include <string>
+#include <cstddef>
+#include <utility>
+
 #include <ostream>
 #include <system_error>
+#endif
+
+#include <libbutl/ft/lang.hxx>
+#include <libbutl/ft/exception.hxx>
+
+#ifdef __cpp_modules
+module butl.utility;
+
+// Only imports additional to interface.
+#ifdef __clang__
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+#endif
+
+#endif
+
 
 namespace butl
 {
-- 
cgit v1.1