From 0a7f4f3f59c1dbbe236dff8e36d6b753d9583932 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 28 Sep 2021 21:32:04 +0300
Subject: Adapt to libbutl headers extension change from .mxx to .hxx

---
 bbot/agent/agent.cxx             |  8 ++++----
 bbot/bootstrap-manifest.cxx      |  4 ++--
 bbot/bootstrap-manifest.test.cxx |  4 ++--
 bbot/diagnostics.hxx             |  2 +-
 bbot/machine-manifest.cxx        |  8 ++++----
 bbot/machine-manifest.test.cxx   |  4 ++--
 bbot/types.hxx                   | 24 ++++++++++++------------
 bbot/utility.hxx                 | 14 +++++++-------
 bbot/utility.txx                 |  6 +++---
 bbot/worker/worker.cxx           | 14 +++++++-------
 10 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'bbot')

diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index ee8c48c..cfff5e4 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -24,10 +24,10 @@
 #include <iostream>
 #include <system_error> // generic_category()
 
-#include <libbutl/pager.mxx>
-#include <libbutl/sha256.mxx>
-#include <libbutl/openssl.mxx>
-#include <libbutl/filesystem.mxx> // dir_iterator, try_rmfile(), readsymlink()
+#include <libbutl/pager.hxx>
+#include <libbutl/sha256.hxx>
+#include <libbutl/openssl.hxx>
+#include <libbutl/filesystem.hxx> // dir_iterator, try_rmfile(), readsymlink()
 
 #include <libbbot/manifest.hxx>
 
diff --git a/bbot/bootstrap-manifest.cxx b/bbot/bootstrap-manifest.cxx
index 9e3bcc5..ff24abb 100644
--- a/bbot/bootstrap-manifest.cxx
+++ b/bbot/bootstrap-manifest.cxx
@@ -3,8 +3,8 @@
 
 #include <bbot/bootstrap-manifest.hxx>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace butl;
 
diff --git a/bbot/bootstrap-manifest.test.cxx b/bbot/bootstrap-manifest.test.cxx
index 2f5306c..26e027a 100644
--- a/bbot/bootstrap-manifest.test.cxx
+++ b/bbot/bootstrap-manifest.test.cxx
@@ -4,8 +4,8 @@
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <iostream>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
diff --git a/bbot/diagnostics.hxx b/bbot/diagnostics.hxx
index 575e91b..c5a81d7 100644
--- a/bbot/diagnostics.hxx
+++ b/bbot/diagnostics.hxx
@@ -4,7 +4,7 @@
 #ifndef BBOT_DIAGNOSTICS_HXX
 #define BBOT_DIAGNOSTICS_HXX
 
-#include <libbutl/diagnostics.mxx>
+#include <libbutl/diagnostics.hxx>
 
 #include <bbot/types.hxx> // Note: not <bbot/utility>.
 
diff --git a/bbot/machine-manifest.cxx b/bbot/machine-manifest.cxx
index 256f4f7..2b9f9a6 100644
--- a/bbot/machine-manifest.cxx
+++ b/bbot/machine-manifest.cxx
@@ -5,10 +5,10 @@
 
 #include <sstream>
 
-#include <libbutl/tab-parser.mxx>
-#include <libbutl/string-parser.mxx>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/tab-parser.hxx>
+#include <libbutl/string-parser.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bbot/machine-manifest.test.cxx b/bbot/machine-manifest.test.cxx
index 0d1b9f9..061f04e 100644
--- a/bbot/machine-manifest.test.cxx
+++ b/bbot/machine-manifest.test.cxx
@@ -4,8 +4,8 @@
 #include <ios>      // ios_base::failbit, ios_base::badbit
 #include <iostream>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/utility.hxx>
diff --git a/bbot/types.hxx b/bbot/types.hxx
index 4996425..ea08bc6 100644
--- a/bbot/types.hxx
+++ b/bbot/types.hxx
@@ -19,13 +19,13 @@
 #include <stdexcept>     // logic_error, invalid_argument, runtime_error
 #include <system_error>
 
-#include <libbutl/path.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/fdstream.mxx>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/fdstream.hxx>
 #include <libbutl/lz4-stream.hxx>
-#include <libbutl/vector-view.mxx>
-#include <libbutl/small-vector.mxx>
-#include <libbutl/standard-version.mxx>
+#include <libbutl/vector-view.hxx>
+#include <libbutl/small-vector.hxx>
+#include <libbutl/standard-version.hxx>
 
 namespace bbot
 {
@@ -66,12 +66,12 @@ namespace bbot
   using std::generic_category;
   using io_error = std::ios_base::failure;
 
-  // <libbutl/optional.mxx>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
 
-  // <libbutl/fdstream.mxx>
+  // <libbutl/fdstream.hxx>
   //
   using butl::auto_fd;
   using butl::ifdstream;
@@ -82,15 +82,15 @@ namespace bbot
   using olz4stream = butl::lz4::ostream;
   using ilz4stream = butl::lz4::istream;
 
-  // <libbutl/vector-view.mxx>
+  // <libbutl/vector-view.hxx>
   //
   using butl::vector_view;
 
-  // <libbutl/small-vector.mxx>
+  // <libbutl/small-vector.hxx>
   //
   using butl::small_vector;
 
-  // <libbutl/path.mxx>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -100,7 +100,7 @@ namespace bbot
   using paths = std::vector<path>;
   using dir_paths = std::vector<dir_path>;
 
-  // <libbutl/standard-version.mxx>
+  // <libbutl/standard-version.hxx>
   //
   using butl::standard_version;
 }
diff --git a/bbot/utility.hxx b/bbot/utility.hxx
index a396322..2bc0320 100644
--- a/bbot/utility.hxx
+++ b/bbot/utility.hxx
@@ -12,11 +12,11 @@
 
 #include <libbutl/ft/lang.hxx>
 
-#include <libbutl/curl.mxx>
-#include <libbutl/process.mxx>
-#include <libbutl/process-io.mxx>
-#include <libbutl/utility.mxx>    // icasecmp(), reverse_iterate(), etc
-#include <libbutl/filesystem.mxx>
+#include <libbutl/curl.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/process-io.hxx>
+#include <libbutl/utility.hxx>    // icasecmp(), reverse_iterate(), etc
+#include <libbutl/filesystem.hxx>
 
 #include <bbot/types.hxx>
 #include <bbot/version.hxx>
@@ -33,7 +33,7 @@ namespace bbot
   using std::to_string;
   using std::stoull;
 
-  // <libbutl/utility.mxx>
+  // <libbutl/utility.hxx>
   //
   using butl::icasecmp;
   using butl::reverse_iterate;
@@ -45,7 +45,7 @@ namespace bbot
   using butl::setenv;
   using butl::unsetenv;
 
-  // <libbutl/filesystem.mxx>
+  // <libbutl/filesystem.hxx>
   //
   using butl::auto_rmdir;
   using butl::auto_rmfile;
diff --git a/bbot/utility.txx b/bbot/utility.txx
index 13a32d1..398c78d 100644
--- a/bbot/utility.txx
+++ b/bbot/utility.txx
@@ -3,10 +3,10 @@
 
 #include <iostream> // cin
 
-#include <libbutl/fdstream.mxx>
+#include <libbutl/fdstream.hxx>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <bbot/diagnostics.hxx>
 
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 2dcd955..250d0d1 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -14,13 +14,13 @@
 #include <iostream>
 #include <algorithm> // find(), find_if(), remove_if()
 
-#include <libbutl/b.mxx>
-#include <libbutl/pager.mxx>
-#include <libbutl/prompt.mxx>
-#include <libbutl/utility.mxx>       // to_utf8()
-#include <libbutl/timestamp.mxx>
-#include <libbutl/filesystem.mxx>
-#include <libbutl/string-parser.mxx>
+#include <libbutl/b.hxx>
+#include <libbutl/pager.hxx>
+#include <libbutl/prompt.hxx>
+#include <libbutl/utility.hxx>       // to_utf8()
+#include <libbutl/timestamp.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/string-parser.hxx>
 
 #include <libbbot/manifest.hxx>
 
-- 
cgit v1.1