From df1ef68cd8e8582724ce1192bfc202e0b9aeaf0c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 28 Sep 2021 19:24:31 +0300
Subject: Get rid of C++ modules related code and rename *.mxx files to *.hxx

---
 libbutl/fdstream.cxx | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

(limited to 'libbutl/fdstream.cxx')

diff --git a/libbutl/fdstream.cxx b/libbutl/fdstream.cxx
index eb0ec7b..85459de 100644
--- a/libbutl/fdstream.cxx
+++ b/libbutl/fdstream.cxx
@@ -1,9 +1,7 @@
 // file      : libbutl/fdstream.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef __cpp_modules_ts
-#include <libbutl/fdstream.mxx>
-#endif
+#include <libbutl/fdstream.hxx>
 
 #include <errno.h> // errno, E*
 
@@ -39,52 +37,21 @@
 #  include <algorithm> // count()
 #endif
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
-#include <vector>
-#include <string>
-#include <chrono>
-#include <istream>
-#include <ostream>
-#include <utility>
-#include <cstdint>
-#include <cstddef>
-
 #include <ios>          // ios_base::openmode, ios_base::failure
 #include <new>          // bad_alloc
 #include <limits>       // numeric_limits
+#include <cassert>
 #include <cstring>      // memcpy(), memmove()
 #include <iostream>     // cin, cout
 #include <exception>    // uncaught_exception[s]()
 #include <stdexcept>    // invalid_argument
 #include <system_error>
-#endif
 
-#include <libbutl/ft/exception.hxx>     // uncaught_exceptions
+#include <libbutl/ft/exception.hxx>    // uncaught_exceptions
 #include <libbutl/process-details.hxx>
 
-#ifdef __cpp_modules_ts
-module butl.fdstream;
-
-// Only imports additional to interface.
-#ifdef __clang__
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-import std.threading; // Clang wants it in purview (see process-details.hxx).
-#endif
-import butl.path;
-import butl.filesystem;
-import butl.small_vector;
-#endif
-
-import butl.utility; // throw_*_ios_failure(), function_cast()
-import butl.timestamp;
-#else
-#include <libbutl/utility.mxx>
-#include <libbutl/timestamp.mxx>
-#endif
+#include <libbutl/utility.hxx>   // throw_*_ios_failure(), function_cast()
+#include <libbutl/timestamp.hxx>
 
 using namespace std;
 
-- 
cgit v1.1