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

---
 bdep/bdep.cxx           |  2 +-
 bdep/ci-types.hxx       |  2 +-
 bdep/ci.cxx             |  4 ++--
 bdep/diagnostics.cxx    |  4 ++--
 bdep/diagnostics.hxx    |  2 +-
 bdep/git.cxx            |  2 +-
 bdep/git.hxx            |  2 +-
 bdep/help.cxx           |  2 +-
 bdep/http-service.cxx   |  2 +-
 bdep/http-service.hxx   |  2 +-
 bdep/new.cxx            |  6 +++---
 bdep/project.cxx        |  2 +-
 bdep/project.hxx        |  2 +-
 bdep/publish.cxx        |  4 ++--
 bdep/release.cxx        |  4 ++--
 bdep/types.hxx          | 38 +++++++++++++++++++-------------------
 bdep/utility.cxx        |  4 ++--
 bdep/utility.hxx        | 22 +++++++++++-----------
 bdep/wrapper-traits.hxx |  2 +-
 19 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/bdep/bdep.cxx b/bdep/bdep.cxx
index 7bc747d..dd65c25 100644
--- a/bdep/bdep.cxx
+++ b/bdep/bdep.cxx
@@ -11,7 +11,7 @@
 #include <exception>   // set_terminate(), terminate_handler
 #include <type_traits> // enable_if, is_base_of
 
-#include <libbutl/backtrace.mxx> // backtrace()
+#include <libbutl/backtrace.hxx> // backtrace()
 
 #include <bdep/types.hxx>
 #include <bdep/utility.hxx>
diff --git a/bdep/ci-types.hxx b/bdep/ci-types.hxx
index 09f3fae..1e8feea 100644
--- a/bdep/ci-types.hxx
+++ b/bdep/ci-types.hxx
@@ -6,7 +6,7 @@
 
 #include <bdep/types.hxx>
 
-#include <libbutl/manifest-types.mxx>
+#include <libbutl/manifest-types.hxx>
 
 namespace bdep
 {
diff --git a/bdep/ci.cxx b/bdep/ci.cxx
index a4acd94..1182108 100644
--- a/bdep/ci.cxx
+++ b/bdep/ci.cxx
@@ -5,8 +5,8 @@
 
 #include <sstream>
 
-#include <libbutl/path-pattern.mxx>
-#include <libbutl/manifest-types.mxx>
+#include <libbutl/path-pattern.hxx>
+#include <libbutl/manifest-types.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bdep/diagnostics.cxx b/bdep/diagnostics.cxx
index 67d7fb4..81c67be 100644
--- a/bdep/diagnostics.cxx
+++ b/bdep/diagnostics.cxx
@@ -5,8 +5,8 @@
 
 #include <odb/statement.hxx>
 
-#include <libbutl/process.mxx>
-#include <libbutl/process-io.mxx> // operator<<(ostream, process_arg)
+#include <libbutl/process.hxx>
+#include <libbutl/process-io.hxx> // operator<<(ostream, process_arg)
 
 #include <bdep/utility.hxx>
 
diff --git a/bdep/diagnostics.hxx b/bdep/diagnostics.hxx
index 4d885fb..e560724 100644
--- a/bdep/diagnostics.hxx
+++ b/bdep/diagnostics.hxx
@@ -8,7 +8,7 @@
 
 #include <odb/tracer.hxx>
 
-#include <libbutl/diagnostics.mxx>
+#include <libbutl/diagnostics.hxx>
 
 #include <bdep/types.hxx> // Note: not <bdep/utility.hxx>
 
diff --git a/bdep/git.cxx b/bdep/git.cxx
index 1749efe..2da7456 100644
--- a/bdep/git.cxx
+++ b/bdep/git.cxx
@@ -3,7 +3,7 @@
 
 #include <bdep/git.hxx>
 
-#include <libbutl/git.mxx>
+#include <libbutl/git.hxx>
 
 #include <bdep/diagnostics.hxx>
 
diff --git a/bdep/git.hxx b/bdep/git.hxx
index bfc5cd2..b7703ea 100644
--- a/bdep/git.hxx
+++ b/bdep/git.hxx
@@ -4,7 +4,7 @@
 #ifndef BDEP_GIT_HXX
 #define BDEP_GIT_HXX
 
-#include <libbutl/git.mxx>
+#include <libbutl/git.hxx>
 
 #include <bdep/types.hxx>
 #include <bdep/utility.hxx>
diff --git a/bdep/help.cxx b/bdep/help.cxx
index b5bef1f..99e4452 100644
--- a/bdep/help.cxx
+++ b/bdep/help.cxx
@@ -3,7 +3,7 @@
 
 #include <bdep/help.hxx>
 
-#include <libbutl/pager.mxx>
+#include <libbutl/pager.hxx>
 
 #include <bdep/diagnostics.hxx>
 #include <bdep/bdep-options.hxx>
diff --git a/bdep/http-service.cxx b/bdep/http-service.cxx
index f18f4c6..84be22e 100644
--- a/bdep/http-service.cxx
+++ b/bdep/http-service.cxx
@@ -5,7 +5,7 @@
 
 #include <cstdlib> // strtoul()
 
-#include <libbutl/fdstream.mxx> // fdterm()
+#include <libbutl/fdstream.hxx> // fdterm()
 
 #include <bdep/diagnostics.hxx>
 
diff --git a/bdep/http-service.hxx b/bdep/http-service.hxx
index 8a0e54f..cbe4328 100644
--- a/bdep/http-service.hxx
+++ b/bdep/http-service.hxx
@@ -4,7 +4,7 @@
 #ifndef BDEP_HTTP_SERVICE_HXX
 #define BDEP_HTTP_SERVICE_HXX
 
-#include <libbutl/manifest-types.mxx>
+#include <libbutl/manifest-types.hxx>
 
 #include <bdep/types.hxx>
 #include <bdep/utility.hxx>
diff --git a/bdep/new.cxx b/bdep/new.cxx
index f02626a..a888250 100644
--- a/bdep/new.cxx
+++ b/bdep/new.cxx
@@ -6,9 +6,9 @@
 #include <map>
 #include <algorithm> // replace()
 
-#include <libbutl/regex.mxx>
-#include <libbutl/command.mxx>
-#include <libbutl/project-name.mxx>
+#include <libbutl/regex.hxx>
+#include <libbutl/command.hxx>
+#include <libbutl/project-name.hxx>
 
 #include <bdep/git.hxx>
 #include <bdep/project.hxx>
diff --git a/bdep/project.cxx b/bdep/project.cxx
index 8280a48..93d24f1 100644
--- a/bdep/project.cxx
+++ b/bdep/project.cxx
@@ -4,7 +4,7 @@
 #include <bdep/project.hxx>
 #include <bdep/project-odb.hxx>
 
-#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bdep/project.hxx b/bdep/project.hxx
index 5c6be87..9265945 100644
--- a/bdep/project.hxx
+++ b/bdep/project.hxx
@@ -6,7 +6,7 @@
 
 #include <odb/core.hxx>
 
-#include <libbutl/b.mxx>
+#include <libbutl/b.hxx>
 
 #include <libbpkg/package-name.hxx>
 
diff --git a/bdep/publish.cxx b/bdep/publish.cxx
index 3034055..bae4316 100644
--- a/bdep/publish.cxx
+++ b/bdep/publish.cxx
@@ -3,8 +3,8 @@
 
 #include <bdep/publish.hxx>
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bdep/release.cxx b/bdep/release.cxx
index 3f13427..0e0f0a6 100644
--- a/bdep/release.cxx
+++ b/bdep/release.cxx
@@ -5,8 +5,8 @@
 
 #include <iostream> // cout
 
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-rewriter.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-rewriter.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bdep/types.hxx b/bdep/types.hxx
index 2413382..1fc3d1a 100644
--- a/bdep/types.hxx
+++ b/bdep/types.hxx
@@ -21,17 +21,17 @@
 
 #include <odb/sqlite/forward.hxx>
 
-#include <libbutl/url.mxx>
-#include <libbutl/path.mxx>
+#include <libbutl/url.hxx>
+#include <libbutl/path.hxx>
 #include <libbutl/uuid.hxx>
 #include <libbutl/uuid-io.hxx>
-#include <libbutl/process.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/small-vector.mxx>
-#include <libbutl/default-options.mxx>
-#include <libbutl/semantic-version.mxx>
-#include <libbutl/standard-version.mxx>
+#include <libbutl/process.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/small-vector.hxx>
+#include <libbutl/default-options.hxx>
+#include <libbutl/semantic-version.hxx>
+#include <libbutl/standard-version.hxx>
 
 namespace bdep
 {
@@ -55,7 +55,7 @@ namespace bdep
   using std::weak_ptr;
 
   using std::vector;
-  using butl::small_vector; // <libbutl/small-vector.mxx>
+  using butl::small_vector; // <libbutl/small-vector.hxx>
 
   using strings = vector<string>;
   using cstrings = vector<const char*>;
@@ -77,16 +77,16 @@ namespace bdep
   using odb::sqlite::database;
   using odb::sqlite::transaction;
 
-  // <libbutl/optional.mxx>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
 
-  // <libbutl/url.mxx>
+  // <libbutl/url.hxx>
   //
   using butl::url;
 
-  // <libbutl/path.mxx>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -98,11 +98,11 @@ namespace bdep
   using paths = vector<path>;
   using dir_paths = vector<dir_path>;
 
-  // <libbutl/uuid.mxx>
+  // <libbutl/uuid.hxx>
   //
   using butl::uuid;
 
-  // <libbutl/process.mxx>
+  // <libbutl/process.hxx>
   //
   using butl::process;
   using butl::process_env;
@@ -110,7 +110,7 @@ namespace bdep
   using butl::process_exit;
   using butl::process_error;
 
-  // <libbutl/fdstream.mxx>
+  // <libbutl/fdstream.hxx>
   //
   using butl::auto_fd;
   using butl::fdpipe;
@@ -119,14 +119,14 @@ namespace bdep
   using butl::fdopen_mode;
   using butl::fdstream_mode;
 
-  // <libbutl/default-options.mxx>
+  // <libbutl/default-options.hxx>
   //
   using butl::default_options_files;
   using butl::default_options_entry;
   using butl::default_options;
 
-  // <libbutl/semantic-version.mxx>
-  // <libbutl/standard-version.mxx>
+  // <libbutl/semantic-version.hxx>
+  // <libbutl/standard-version.hxx>
   //
   using butl::semantic_version;
   using butl::standard_version;
diff --git a/bdep/utility.cxx b/bdep/utility.cxx
index 6cab4fa..2a7808f 100644
--- a/bdep/utility.cxx
+++ b/bdep/utility.cxx
@@ -3,8 +3,8 @@
 
 #include <bdep/utility.hxx>
 
-#include <libbutl/process.mxx>
-#include <libbutl/fdstream.mxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
 
 #include <bdep/diagnostics.hxx>
 
diff --git a/bdep/utility.hxx b/bdep/utility.hxx
index 8e3ca3c..e43b4ff 100644
--- a/bdep/utility.hxx
+++ b/bdep/utility.hxx
@@ -13,14 +13,14 @@
 
 #include <libbutl/ft/lang.hxx>
 
-#include <libbutl/utility.mxx>         // icasecmp(), reverse_iterate(), etc
-#include <libbutl/prompt.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/filesystem.mxx>
-#include <libbutl/default-options.mxx>
+#include <libbutl/utility.hxx>         // icasecmp(), reverse_iterate(), etc
+#include <libbutl/prompt.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/default-options.hxx>
 
-#include <libbutl/manifest-parser.mxx>     // manifest_parser::filter_function
-#include <libbutl/manifest-serializer.mxx> // manifest_serializer::filter_function
+#include <libbutl/manifest-parser.hxx>     // manifest_parser::filter_function
+#include <libbutl/manifest-serializer.hxx> // manifest_serializer::filter_function
 
 #include <bdep/types.hxx>
 #include <bdep/version.hxx>
@@ -40,7 +40,7 @@ namespace bdep
   using std::find;
   using std::find_if;
 
-  // <libbutl/utility.mxx>
+  // <libbutl/utility.hxx>
   //
   using butl::ucase;
   using butl::lcase;
@@ -59,16 +59,16 @@ namespace bdep
   using butl::setenv;
   using butl::unsetenv;
 
-  // <libbutl/prompt.mxx>
+  // <libbutl/prompt.hxx>
   //
   using butl::yn_prompt;
 
-  // <libbutl/filesystem.mxx>
+  // <libbutl/filesystem.hxx>
   //
   using butl::auto_rmfile;
   using butl::auto_rmdir;
 
-  // <libbutl/default-options.mxx>
+  // <libbutl/default-options.hxx>
   //
   using butl::load_default_options;
   using butl::merge_default_options;
diff --git a/bdep/wrapper-traits.hxx b/bdep/wrapper-traits.hxx
index b860f56..c3d58a0 100644
--- a/bdep/wrapper-traits.hxx
+++ b/bdep/wrapper-traits.hxx
@@ -6,7 +6,7 @@
 
 #include <cstdint>
 
-#include <libbutl/optional.mxx>
+#include <libbutl/optional.hxx>
 
 #include <odb/wrapper-traits.hxx>
 
-- 
cgit v1.1