From 8ac13516f2def2c8d01a2ea11a039ebeafdef8fe Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 3 Oct 2017 23:36:57 +0300
Subject: Adapt to modularization of libbutl

---
 bbot/agent/agent.cxx                     |  8 ++++----
 bbot/bootstrap-manifest.cxx              |  4 ++--
 bbot/diagnostics.hxx                     |  2 +-
 bbot/machine-manifest.cxx                |  8 ++++----
 bbot/types.hxx                           | 20 ++++++++++----------
 bbot/utility.hxx                         | 18 +++++++++---------
 bbot/utility.txx                         |  6 +++---
 bbot/worker/worker.cxx                   |  4 ++--
 unit-tests/bootstrap-manifest/driver.cxx |  4 ++--
 unit-tests/machine-manifest/driver.cxx   |  4 ++--
 10 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index c8e316a..b0f4d25 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -19,10 +19,10 @@
 #include <chrono>
 #include <iostream>
 
-#include <libbutl/pager.hxx>
-#include <libbutl/sha256.hxx>
-#include <libbutl/openssl.hxx>
-#include <libbutl/filesystem.hxx> // dir_iterator
+#include <libbutl/pager.mxx>
+#include <libbutl/sha256.mxx>
+#include <libbutl/openssl.mxx>
+#include <libbutl/filesystem.mxx> // dir_iterator
 
 #include <libbbot/manifest.hxx>
 
diff --git a/bbot/bootstrap-manifest.cxx b/bbot/bootstrap-manifest.cxx
index e9697bd..8c846da 100644
--- a/bbot/bootstrap-manifest.cxx
+++ b/bbot/bootstrap-manifest.cxx
@@ -4,8 +4,8 @@
 
 #include <bbot/bootstrap-manifest.hxx>
 
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 using namespace butl;
 
diff --git a/bbot/diagnostics.hxx b/bbot/diagnostics.hxx
index 99d3df4..f178b7d 100644
--- a/bbot/diagnostics.hxx
+++ b/bbot/diagnostics.hxx
@@ -5,7 +5,7 @@
 #ifndef BBOT_DIAGNOSTICS_HXX
 #define BBOT_DIAGNOSTICS_HXX
 
-#include <libbutl/diagnostics.hxx>
+#include <libbutl/diagnostics.mxx>
 
 #include <bbot/types.hxx> // Note: not <bbot/utility>.
 
diff --git a/bbot/machine-manifest.cxx b/bbot/machine-manifest.cxx
index b7baf7e..be921d9 100644
--- a/bbot/machine-manifest.cxx
+++ b/bbot/machine-manifest.cxx
@@ -6,10 +6,10 @@
 
 #include <sstream>
 
-#include <libbutl/tab-parser.hxx>
-#include <libbutl/string-parser.hxx>
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/tab-parser.mxx>
+#include <libbutl/string-parser.mxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bbot/types.hxx b/bbot/types.hxx
index e1c1cca..fbe1713 100644
--- a/bbot/types.hxx
+++ b/bbot/types.hxx
@@ -20,11 +20,11 @@
 #include <stdexcept>     // logic_error, invalid_argument, runtime_error
 #include <system_error>
 
-#include <libbutl/path.hxx>
-#include <libbutl/optional.hxx>
-#include <libbutl/vector-view.hxx>
-#include <libbutl/small-vector.hxx>
-#include <libbutl/standard-version.hxx>
+#include <libbutl/path.mxx>
+#include <libbutl/optional.mxx>
+#include <libbutl/vector-view.mxx>
+#include <libbutl/small-vector.mxx>
+#include <libbutl/standard-version.mxx>
 
 namespace bbot
 {
@@ -64,20 +64,20 @@ namespace bbot
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <libbutl/optional.hxx>
+  // <libbutl/optional.mxx>
   //
   using butl::optional;
   using butl::nullopt;
 
-  // <libbutl/vector-view.hxx>
+  // <libbutl/vector-view.mxx>
   //
   using butl::vector_view;
 
-  // <libbutl/small-vector.hxx>
+  // <libbutl/small-vector.mxx>
   //
   using butl::small_vector;
 
-  // <libbutl/path.hxx>
+  // <libbutl/path.mxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -87,7 +87,7 @@ namespace bbot
   using paths = std::vector<path>;
   using dir_paths = std::vector<dir_path>;
 
-  // <libbutl/standard-version.hxx>
+  // <libbutl/standard-version.mxx>
   //
   using butl::standard_version;
 }
diff --git a/bbot/utility.hxx b/bbot/utility.hxx
index 7a172a2..e03ee49 100644
--- a/bbot/utility.hxx
+++ b/bbot/utility.hxx
@@ -13,12 +13,12 @@
 
 #include <libbutl/ft/lang.hxx>
 
-#include <libbutl/curl.hxx>
-#include <libbutl/process.hxx>
-#include <libbutl/process-io.hxx>
-#include <libbutl/utility.hxx>    // casecmp(), reverse_iterate(), etc
-#include <libbutl/fdstream.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/curl.mxx>
+#include <libbutl/process.mxx>
+#include <libbutl/process-io.mxx>
+#include <libbutl/utility.mxx>    // casecmp(), reverse_iterate(), etc
+#include <libbutl/fdstream.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <bbot/types.hxx>
 #include <bbot/version.hxx>
@@ -35,7 +35,7 @@ namespace bbot
   using std::to_string;
   using std::stoull;
 
-  // <libbutl/utility.hxx>
+  // <libbutl/utility.mxx>
   //
   using butl::casecmp;
   using butl::reverse_iterate;
@@ -43,11 +43,11 @@ namespace bbot
   using butl::exception_guard;
   using butl::make_exception_guard;
 
-  // <libbutl/fdstream.hxx>
+  // <libbutl/fdstream.mxx>
   //
   using butl::auto_fd;
 
-  // <libbutl/filesystem.hxx>
+  // <libbutl/filesystem.mxx>
   //
   using butl::auto_rmdir;
   using butl::auto_rmfile;
diff --git a/bbot/utility.txx b/bbot/utility.txx
index 9a82000..edfc3a7 100644
--- a/bbot/utility.txx
+++ b/bbot/utility.txx
@@ -4,10 +4,10 @@
 
 #include <iostream> // cin
 
-#include <libbutl/fdstream.hxx>
+#include <libbutl/fdstream.mxx>
 
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 #include <bbot/diagnostics.hxx>
 
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 348075b..70b2578 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -14,8 +14,8 @@
 #include <cstring>  // strchr()
 #include <iostream>
 
-#include <libbutl/pager.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/pager.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <libbbot/manifest.hxx>
 
diff --git a/unit-tests/bootstrap-manifest/driver.cxx b/unit-tests/bootstrap-manifest/driver.cxx
index a89d516..70a179a 100644
--- a/unit-tests/bootstrap-manifest/driver.cxx
+++ b/unit-tests/bootstrap-manifest/driver.cxx
@@ -5,8 +5,8 @@
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <iostream>
 
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
diff --git a/unit-tests/machine-manifest/driver.cxx b/unit-tests/machine-manifest/driver.cxx
index 44b1e36..aa9fb6a 100644
--- a/unit-tests/machine-manifest/driver.cxx
+++ b/unit-tests/machine-manifest/driver.cxx
@@ -5,8 +5,8 @@
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <iostream>
 
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
-- 
cgit v1.1