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

---
 clean/clean.cxx                  |  2 +-
 libbrep/build.hxx                |  2 +-
 libbrep/common.hxx               |  2 +-
 libbrep/types.hxx                | 22 +++++++++++-----------
 libbrep/utility.hxx              |  4 ++--
 libbrep/wrapper-traits.hxx       |  2 +-
 load/load.cxx                    | 14 +++++++-------
 migrate/migrate.cxx              |  2 +-
 mod/build-config-module.cxx      |  8 ++++----
 mod/build-config-module.hxx      |  2 +-
 mod/build-config.cxx             |  4 ++--
 mod/external-handler.cxx         |  6 +++---
 mod/external-handler.hxx         |  2 +-
 mod/mod-build-log.cxx            |  2 +-
 mod/mod-build-result.cxx         | 12 ++++++------
 mod/mod-build-task.cxx           | 18 +++++++++---------
 mod/mod-builds.cxx               |  4 ++--
 mod/mod-ci.cxx                   | 14 +++++++-------
 mod/mod-repository-details.cxx   |  2 +-
 mod/mod-submit.cxx               | 16 ++++++++--------
 mod/types-parsers.cxx            |  4 ++--
 monitor/monitor.cxx              |  4 ++--
 tests/load/driver.cxx            |  4 ++--
 web/server/apache/request.cxx    |  6 +++---
 web/server/apache/service.cxx    |  4 ++--
 web/server/apache/service.txx    |  2 +-
 web/server/mime-url-encoding.cxx |  2 +-
 web/server/module.hxx            |  4 ++--
 28 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/clean/clean.cxx b/clean/clean.cxx
index 5401ab1..6096249 100644
--- a/clean/clean.cxx
+++ b/clean/clean.cxx
@@ -12,7 +12,7 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.mxx>
+#include <libbutl/pager.hxx>
 
 #include <libbbot/build-config.hxx>
 
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index 8263b9e..151f8dc 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -9,7 +9,7 @@
 #include <odb/core.hxx>
 #include <odb/section.hxx>
 
-#include <libbutl/target-triplet.mxx>
+#include <libbutl/target-triplet.hxx>
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index 0899dc9..98fc4e7 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -114,7 +114,7 @@ namespace brep
                              std::chrono::nanoseconds::period>::value,
     "The following timestamp ODB mapping is invalid");
 
-  // As it pointed out in libbutl/timestamp.mxx we will overflow in year 2262,
+  // As it pointed out in libbutl/timestamp.hxx we will overflow in year 2262,
   // but by that time some larger basic type will be available for mapping.
   //
   #pragma db map type(timestamp) as(uint64_t)                 \
diff --git a/libbrep/types.hxx b/libbrep/types.hxx
index 65dfc2d..3b5777d 100644
--- a/libbrep/types.hxx
+++ b/libbrep/types.hxx
@@ -21,12 +21,12 @@
 
 #include <odb/lazy-ptr.hxx>
 
-#include <libbutl/url.mxx>
-#include <libbutl/path.mxx>
-#include <libbutl/path-io.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/timestamp.mxx>
-#include <libbutl/small-vector.mxx>
+#include <libbutl/url.hxx>
+#include <libbutl/path.hxx>
+#include <libbutl/path-io.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/timestamp.hxx>
+#include <libbutl/small-vector.hxx>
 
 namespace brep
 {
@@ -50,7 +50,7 @@ namespace brep
   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*>;
@@ -69,7 +69,7 @@ namespace brep
 
   using std::generic_category;
 
-  // <libbutl/optional.mxx>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
@@ -79,7 +79,7 @@ namespace brep
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
-  // <libbutl/path.mxx>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -91,11 +91,11 @@ namespace brep
 
   using butl::path_cast;
 
-  // <libbutl/url.mxx>
+  // <libbutl/url.hxx>
   //
   using butl::url;
 
-  // <libbutl/timestamp.mxx>
+  // <libbutl/timestamp.hxx>
   //
   using butl::system_clock;
   using butl::timestamp;
diff --git a/libbrep/utility.hxx b/libbrep/utility.hxx
index be27a71..7058c94 100644
--- a/libbrep/utility.hxx
+++ b/libbrep/utility.hxx
@@ -10,7 +10,7 @@
 #include <cassert>  // assert()
 #include <iterator> // make_move_iterator()
 
-#include <libbutl/utility.mxx> // icasecmp(), reverse_iterate(),
+#include <libbutl/utility.hxx> // icasecmp(), reverse_iterate(),
                                // operator<<(ostream, exception)
 
 namespace brep
@@ -24,7 +24,7 @@ namespace brep
   using std::make_move_iterator;
   using std::to_string;
 
-  // <libbutl/utility.mxx>
+  // <libbutl/utility.hxx>
   //
   using butl::utf8;
   using butl::icasecmp;
diff --git a/libbrep/wrapper-traits.hxx b/libbrep/wrapper-traits.hxx
index 9dad27b..8c9d830 100644
--- a/libbrep/wrapper-traits.hxx
+++ b/libbrep/wrapper-traits.hxx
@@ -6,7 +6,7 @@
 
 #include <odb/pre.hxx>
 
-#include <libbutl/optional.mxx>
+#include <libbutl/optional.hxx>
 
 #include <odb/wrapper-traits.hxx>
 
diff --git a/load/load.cxx b/load/load.cxx
index 4f4e5c4..16bdd40 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -18,13 +18,13 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.mxx>
-#include <libbutl/sha256.mxx>
-#include <libbutl/process.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/filesystem.mxx>
-#include <libbutl/tab-parser.mxx>
-#include <libbutl/manifest-parser.mxx>
+#include <libbutl/pager.hxx>
+#include <libbutl/sha256.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/tab-parser.hxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx
index 88c87c1..1093b7c 100644
--- a/migrate/migrate.cxx
+++ b/migrate/migrate.cxx
@@ -12,7 +12,7 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.mxx>
+#include <libbutl/pager.hxx>
 
 #include <libbrep/package.hxx>
 #include <libbrep/package-odb.hxx>
diff --git a/mod/build-config-module.cxx b/mod/build-config-module.cxx
index 831cb78..1b1d53e 100644
--- a/mod/build-config-module.cxx
+++ b/mod/build-config-module.cxx
@@ -8,10 +8,10 @@
 #include <map>
 #include <sstream>
 
-#include <libbutl/sha256.mxx>
-#include <libbutl/utility.mxx>      // throw_generic_error()
-#include <libbutl/openssl.mxx>
-#include <libbutl/filesystem.mxx>   // dir_iterator, dir_entry
+#include <libbutl/sha256.hxx>
+#include <libbutl/utility.hxx>      // throw_generic_error()
+#include <libbutl/openssl.hxx>
+#include <libbutl/filesystem.hxx>   // dir_iterator, dir_entry
 
 namespace brep
 {
diff --git a/mod/build-config-module.hxx b/mod/build-config-module.hxx
index ba2698d..51813c0 100644
--- a/mod/build-config-module.hxx
+++ b/mod/build-config-module.hxx
@@ -6,7 +6,7 @@
 
 #include <map>
 
-#include <libbutl/utility.mxx> // compare_c_string
+#include <libbutl/utility.hxx> // compare_c_string
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/mod/build-config.cxx b/mod/build-config.cxx
index 43a85e8..8fbbf99 100644
--- a/mod/build-config.cxx
+++ b/mod/build-config.cxx
@@ -3,8 +3,8 @@
 
 #include <mod/build-config.hxx>
 
-#include <libbutl/utility.mxx>      // alpha(), etc.
-#include <libbutl/path-pattern.mxx>
+#include <libbutl/utility.hxx>      // alpha(), etc.
+#include <libbutl/path-pattern.hxx>
 
 namespace brep
 {
diff --git a/mod/external-handler.cxx b/mod/external-handler.cxx
index 2f58bf5..cdf3f71 100644
--- a/mod/external-handler.cxx
+++ b/mod/external-handler.cxx
@@ -13,9 +13,9 @@
 #include <type_traits>  // static_assert
 #include <system_error> // error_code, generic_category()
 
-#include <libbutl/process.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/process-io.mxx> // operator<<(ostream, process_args)
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/process-io.hxx> // operator<<(ostream, process_args)
 
 using namespace std;
 using namespace butl;
diff --git a/mod/external-handler.hxx b/mod/external-handler.hxx
index f8f7ee8..be16e5b 100644
--- a/mod/external-handler.hxx
+++ b/mod/external-handler.hxx
@@ -4,7 +4,7 @@
 #ifndef MOD_EXTERNAL_HANDLER_HXX
 #define MOD_EXTERNAL_HANDLER_HXX
 
-#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-parser.hxx>
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
diff --git a/mod/mod-build-log.cxx b/mod/mod-build-log.cxx
index 3032e52..f106d4f 100644
--- a/mod/mod-build-log.cxx
+++ b/mod/mod-build-log.cxx
@@ -8,7 +8,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/timestamp.mxx> // to_stream()
+#include <libbutl/timestamp.hxx> // to_stream()
 
 #include <web/server/module.hxx>
 
diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx
index bec362a..3ae9f0f 100644
--- a/mod/mod-build-result.cxx
+++ b/mod/mod-build-result.cxx
@@ -6,12 +6,12 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/openssl.mxx>
-#include <libbutl/sendmail.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/process-io.mxx>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/openssl.hxx>
+#include <libbutl/sendmail.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/process-io.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbbot/manifest.hxx>
 
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index b4a8311..8656f5e 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -11,15 +11,15 @@
 #include <odb/transaction.hxx>
 #include <odb/schema-catalog.hxx>
 
-#include <libbutl/regex.mxx>
-#include <libbutl/sha256.mxx>
-#include <libbutl/utility.mxx>             // compare_c_string
-#include <libbutl/openssl.mxx>
-#include <libbutl/fdstream.mxx>            // nullfd
-#include <libbutl/process-io.mxx>
-#include <libbutl/path-pattern.mxx>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/regex.hxx>
+#include <libbutl/sha256.hxx>
+#include <libbutl/utility.hxx>             // compare_c_string
+#include <libbutl/openssl.hxx>
+#include <libbutl/fdstream.hxx>            // nullfd
+#include <libbutl/process-io.hxx>
+#include <libbutl/path-pattern.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbbot/manifest.hxx>
 #include <libbbot/build-config.hxx>
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx
index 5ffe6dd..c5a1f3c 100644
--- a/mod/mod-builds.cxx
+++ b/mod/mod-builds.cxx
@@ -11,8 +11,8 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/timestamp.mxx>    // to_string()
-#include <libbutl/path-pattern.mxx>
+#include <libbutl/timestamp.hxx>    // to_string()
+#include <libbutl/path-pattern.hxx>
 
 #include <libbbot/manifest.hxx> // to_result_status(), to_string(result_status)
 
diff --git a/mod/mod-ci.cxx b/mod/mod-ci.cxx
index 4da72b6..ac69941 100644
--- a/mod/mod-ci.cxx
+++ b/mod/mod-ci.cxx
@@ -6,13 +6,13 @@
 #include <ostream>
 
 #include <libbutl/uuid.hxx>
-#include <libbutl/sendmail.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/timestamp.mxx>
-#include <libbutl/filesystem.mxx>
-#include <libbutl/process-io.mxx>          // operator<<(ostream, process_args)
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/sendmail.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/timestamp.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/process-io.hxx>          // operator<<(ostream, process_args)
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <libbpkg/manifest.hxx>
 #include <libbpkg/package-name.hxx>
diff --git a/mod/mod-repository-details.cxx b/mod/mod-repository-details.cxx
index 813b738..ce7582e 100644
--- a/mod/mod-repository-details.cxx
+++ b/mod/mod-repository-details.cxx
@@ -10,7 +10,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/timestamp.mxx> // to_string()
+#include <libbutl/timestamp.hxx> // to_string()
 
 #include <web/server/module.hxx>
 #include <web/server/mime-url-encoding.hxx>
diff --git a/mod/mod-submit.cxx b/mod/mod-submit.cxx
index 9c93a36..2ad8661 100644
--- a/mod/mod-submit.cxx
+++ b/mod/mod-submit.cxx
@@ -5,14 +5,14 @@
 
 #include <ostream>
 
-#include <libbutl/sha256.mxx>
-#include <libbutl/sendmail.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/timestamp.mxx>
-#include <libbutl/filesystem.mxx>
-#include <libbutl/process-io.mxx>          // operator<<(ostream, process_args)
-#include <libbutl/manifest-types.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/sha256.hxx>
+#include <libbutl/sendmail.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/timestamp.hxx>
+#include <libbutl/filesystem.hxx>
+#include <libbutl/process-io.hxx>          // operator<<(ostream, process_args)
+#include <libbutl/manifest-types.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
 #include <web/server/module.hxx>
 
diff --git a/mod/types-parsers.cxx b/mod/types-parsers.cxx
index 422b353..3868c32 100644
--- a/mod/types-parsers.cxx
+++ b/mod/types-parsers.cxx
@@ -5,8 +5,8 @@
 
 #include <sstream>
 
-#include <libbutl/regex.mxx>
-#include <libbutl/timestamp.mxx> // from_string()
+#include <libbutl/regex.hxx>
+#include <libbutl/timestamp.hxx> // from_string()
 
 #include <mod/module-options.hxx>
 
diff --git a/monitor/monitor.cxx b/monitor/monitor.cxx
index bbab0a5..5c4d451 100644
--- a/monitor/monitor.cxx
+++ b/monitor/monitor.cxx
@@ -13,8 +13,8 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.mxx>
-#include <libbutl/utility.mxx> // compare_c_string
+#include <libbutl/pager.hxx>
+#include <libbutl/utility.hxx> // compare_c_string
 
 #include <libbbot/build-config.hxx>
 
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index 02ce68a..2520f18 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -10,8 +10,8 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/process.mxx>
-#include <libbutl/filesystem.mxx>
+#include <libbutl/process.hxx>
+#include <libbutl/filesystem.hxx>
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
diff --git a/web/server/apache/request.cxx b/web/server/apache/request.cxx
index a413081..64e1e6d 100644
--- a/web/server/apache/request.cxx
+++ b/web/server/apache/request.cxx
@@ -34,9 +34,9 @@
 #include <streambuf>
 #include <algorithm> // min()
 
-#include <libbutl/utility.mxx>   // icasecmp()
-#include <libbutl/optional.mxx>
-#include <libbutl/timestamp.mxx>
+#include <libbutl/utility.hxx>   // icasecmp()
+#include <libbutl/optional.hxx>
+#include <libbutl/timestamp.hxx>
 
 #include <web/server/mime-url-encoding.hxx>
 
diff --git a/web/server/apache/service.cxx b/web/server/apache/service.cxx
index 9fb23da..af5873e 100644
--- a/web/server/apache/service.cxx
+++ b/web/server/apache/service.cxx
@@ -15,8 +15,8 @@
 #include <cstring>   // strlen(), strcmp()
 #include <exception>
 
-#include <libbutl/utility.mxx>  // function_cast()
-#include <libbutl/optional.mxx>
+#include <libbutl/utility.hxx>  // function_cast()
+#include <libbutl/optional.hxx>
 
 #include <web/server/module.hxx>
 #include <web/server/apache/log.hxx>
diff --git a/web/server/apache/service.txx b/web/server/apache/service.txx
index 1b16d0b..9e1037b 100644
--- a/web/server/apache/service.txx
+++ b/web/server/apache/service.txx
@@ -8,7 +8,7 @@
 #include <utility>   // move()
 #include <exception>
 
-#include <libbutl/utility.mxx> // operator<<(ostream, exception)
+#include <libbutl/utility.hxx> // operator<<(ostream, exception)
 
 namespace web
 {
diff --git a/web/server/mime-url-encoding.cxx b/web/server/mime-url-encoding.cxx
index fd1e4e8..fd09cd2 100644
--- a/web/server/mime-url-encoding.cxx
+++ b/web/server/mime-url-encoding.cxx
@@ -6,7 +6,7 @@
 #include <string>
 #include <iterator> // back_inserter
 
-#include <libbutl/url.mxx>
+#include <libbutl/url.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/web/server/module.hxx b/web/server/module.hxx
index beda73c..f870163 100644
--- a/web/server/module.hxx
+++ b/web/server/module.hxx
@@ -14,8 +14,8 @@
 #include <utility>   // move()
 #include <stdexcept> // runtime_error
 
-#include <libbutl/path.mxx>
-#include <libbutl/optional.mxx>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
 
 namespace web
 {
-- 
cgit v1.1