From 1e69164d90f9882b2b90716346b363c25d1fd652 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Tue, 3 Oct 2017 23:35:31 +0300
Subject: Adapt to modularization of libbutl

---
 bpkg/archive.cxx        |  4 ++--
 bpkg/archive.hxx        |  2 +-
 bpkg/auth.cxx           | 14 +++++++-------
 bpkg/cfg-create.cxx     |  2 +-
 bpkg/checksum.cxx       |  6 +++---
 bpkg/diagnostics.cxx    |  2 +-
 bpkg/diagnostics.hxx    |  2 +-
 bpkg/fetch.cxx          |  8 ++++----
 bpkg/help.cxx           |  2 +-
 bpkg/package.hxx        |  4 ++--
 bpkg/pkg-unpack.cxx     |  2 +-
 bpkg/pkg-verify.cxx     |  6 +++---
 bpkg/rep-create.cxx     |  6 +++---
 bpkg/rep-info.cxx       |  4 ++--
 bpkg/satisfaction.cxx   |  4 ++--
 bpkg/types.hxx          |  8 ++++----
 bpkg/utility.cxx        |  4 ++--
 bpkg/utility.hxx        |  6 +++---
 bpkg/wrapper-traits.hxx |  2 +-
 19 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/bpkg/archive.cxx b/bpkg/archive.cxx
index f3c41f8..03728a4 100644
--- a/bpkg/archive.cxx
+++ b/bpkg/archive.cxx
@@ -4,8 +4,8 @@
 
 #include <bpkg/archive.hxx>
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
 
 #include <bpkg/diagnostics.hxx>
 
diff --git a/bpkg/archive.hxx b/bpkg/archive.hxx
index 281827d..1f52808 100644
--- a/bpkg/archive.hxx
+++ b/bpkg/archive.hxx
@@ -5,7 +5,7 @@
 #ifndef BPKG_ARCHIVE_HXX
 #define BPKG_ARCHIVE_HXX
 
-#include <libbutl/process.hxx>
+#include <libbutl/process.mxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
diff --git a/bpkg/auth.cxx b/bpkg/auth.cxx
index 5d9a638..dc4aba8 100644
--- a/bpkg/auth.cxx
+++ b/bpkg/auth.cxx
@@ -9,13 +9,13 @@
 #include <cstring>   // strlen(), strcmp()
 #include <iterator>  // ostreambuf_iterator
 
-#include <libbutl/sha256.hxx>
-#include <libbutl/base64.hxx>
-#include <libbutl/process.hxx>
-#include <libbutl/openssl.hxx>
-#include <libbutl/fdstream.hxx>
-#include <libbutl/timestamp.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/sha256.mxx>
+#include <libbutl/base64.mxx>
+#include <libbutl/process.mxx>
+#include <libbutl/openssl.mxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/timestamp.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <bpkg/package.hxx>
 #include <bpkg/package-odb.hxx>
diff --git a/bpkg/cfg-create.cxx b/bpkg/cfg-create.cxx
index df7d779..7592801 100644
--- a/bpkg/cfg-create.cxx
+++ b/bpkg/cfg-create.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/cfg-create.hxx>
 
-#include <libbutl/fdstream.hxx>
+#include <libbutl/fdstream.mxx>
 
 #include <bpkg/package.hxx>
 #include <bpkg/package-odb.hxx>
diff --git a/bpkg/checksum.cxx b/bpkg/checksum.cxx
index 2e639ef..a4b218a 100644
--- a/bpkg/checksum.cxx
+++ b/bpkg/checksum.cxx
@@ -6,9 +6,9 @@
 
 #include <streambuf>
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <bpkg/diagnostics.hxx>
 
diff --git a/bpkg/diagnostics.cxx b/bpkg/diagnostics.cxx
index 7fafbb9..9672926 100644
--- a/bpkg/diagnostics.cxx
+++ b/bpkg/diagnostics.cxx
@@ -9,7 +9,7 @@
 
 #include <odb/statement.hxx>
 
-#include <libbutl/process.hxx>
+#include <libbutl/process.mxx>
 
 using namespace std;
 using namespace butl;
diff --git a/bpkg/diagnostics.hxx b/bpkg/diagnostics.hxx
index f9a4ac5..cbce2f2 100644
--- a/bpkg/diagnostics.hxx
+++ b/bpkg/diagnostics.hxx
@@ -7,7 +7,7 @@
 
 #include <odb/tracer.hxx>
 
-#include <libbutl/diagnostics.hxx>
+#include <libbutl/diagnostics.mxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
diff --git a/bpkg/fetch.cxx b/bpkg/fetch.cxx
index e25f316..700e345 100644
--- a/bpkg/fetch.cxx
+++ b/bpkg/fetch.cxx
@@ -6,10 +6,10 @@
 
 #include <sstream>
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
-#include <libbutl/filesystem.hxx>
-#include <libbutl/manifest-parser.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/filesystem.mxx>
+#include <libbutl/manifest-parser.mxx>
 
 #include <bpkg/checksum.hxx>
 #include <bpkg/diagnostics.hxx>
diff --git a/bpkg/help.cxx b/bpkg/help.cxx
index 16a743c..c66fd66 100644
--- a/bpkg/help.cxx
+++ b/bpkg/help.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/help.hxx>
 
-#include <libbutl/pager.hxx>
+#include <libbutl/pager.mxx>
 
 #include <bpkg/diagnostics.hxx>
 #include <bpkg/bpkg-options.hxx>
diff --git a/bpkg/package.hxx b/bpkg/package.hxx
index eeec449..b5ad0f3 100644
--- a/bpkg/package.hxx
+++ b/bpkg/package.hxx
@@ -14,7 +14,7 @@
 #include <odb/core.hxx>
 #include <odb/nested-container.hxx>
 
-#include <libbutl/timestamp.hxx>
+#include <libbutl/timestamp.mxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/utility.hxx>
@@ -68,7 +68,7 @@ namespace bpkg
                              std::chrono::nanoseconds::period>::value,
     "The following timestamp ODB mapping is invalid");
 
-  // As pointed out in libbutl/timestamp.hxx we will overflow in year 2262, but
+  // As pointed out in libbutl/timestamp.mxx 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/bpkg/pkg-unpack.cxx b/bpkg/pkg-unpack.cxx
index 56e8619..50c5137 100644
--- a/bpkg/pkg-unpack.cxx
+++ b/bpkg/pkg-unpack.cxx
@@ -4,7 +4,7 @@
 
 #include <bpkg/pkg-unpack.hxx>
 
-#include <libbutl/process.hxx>
+#include <libbutl/process.mxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx
index fca6e6d..e388001 100644
--- a/bpkg/pkg-verify.cxx
+++ b/bpkg/pkg-verify.cxx
@@ -4,9 +4,9 @@
 
 #include <bpkg/pkg-verify.hxx>
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
-#include <libbutl/manifest-parser.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/manifest-parser.mxx>
 
 #include <bpkg/archive.hxx>
 #include <bpkg/diagnostics.hxx>
diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx
index 49d49f4..173e2b0 100644
--- a/bpkg/rep-create.cxx
+++ b/bpkg/rep-create.cxx
@@ -6,9 +6,9 @@
 
 #include <map>
 
-#include <libbutl/fdstream.hxx>
-#include <libbutl/filesystem.hxx>          // dir_iterator
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/fdstream.mxx>
+#include <libbutl/filesystem.mxx>          // dir_iterator
+#include <libbutl/manifest-serializer.mxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/rep-info.cxx b/bpkg/rep-info.cxx
index 50dd146..f6a8d2d 100644
--- a/bpkg/rep-info.cxx
+++ b/bpkg/rep-info.cxx
@@ -6,8 +6,8 @@
 
 #include <iostream>  // cout
 
-#include <libbutl/sha256.hxx>              // sha256_to_fingerprint()
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/sha256.mxx>              // sha256_to_fingerprint()
+#include <libbutl/manifest-serializer.mxx>
 
 #include <libbpkg/manifest.hxx>
 
diff --git a/bpkg/satisfaction.cxx b/bpkg/satisfaction.cxx
index ca83f51..9aaca23 100644
--- a/bpkg/satisfaction.cxx
+++ b/bpkg/satisfaction.cxx
@@ -4,8 +4,8 @@
 
 #include <bpkg/satisfaction.hxx>
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
 
 #include <bpkg/utility.hxx>
 #include <bpkg/package-odb.hxx>
diff --git a/bpkg/types.hxx b/bpkg/types.hxx
index 31c325c..505d468 100644
--- a/bpkg/types.hxx
+++ b/bpkg/types.hxx
@@ -22,8 +22,8 @@
 
 #include <odb/lazy-ptr.hxx>
 
-#include <libbutl/path.hxx>
-#include <libbutl/optional.hxx>
+#include <libbutl/path.mxx>
+#include <libbutl/optional.mxx>
 
 namespace bpkg
 {
@@ -63,7 +63,7 @@ namespace bpkg
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <libbutl/optional.hxx>
+  // <libbutl/optional.mxx>
   //
   using butl::optional;
   using butl::nullopt;
@@ -73,7 +73,7 @@ namespace bpkg
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
-  // <libbutl/path.hxx>
+  // <libbutl/path.mxx>
   //
   using butl::path;
   using butl::dir_path;
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx
index 06e07a8..4990781 100644
--- a/bpkg/utility.cxx
+++ b/bpkg/utility.cxx
@@ -6,8 +6,8 @@
 
 #include <iostream>     // cout, cin
 
-#include <libbutl/process.hxx>
-#include <libbutl/fdstream.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/fdstream.mxx>
 
 #include <bpkg/diagnostics.hxx>
 #include <bpkg/common-options.hxx>
diff --git a/bpkg/utility.hxx b/bpkg/utility.hxx
index 3314393..8a1107c 100644
--- a/bpkg/utility.hxx
+++ b/bpkg/utility.hxx
@@ -13,9 +13,9 @@
 
 #include <libbutl/ft/lang.hxx>
 
-#include <libbutl/utility.hxx> // casecmp(), reverse_iterate(), etc
+#include <libbutl/utility.mxx> // casecmp(), reverse_iterate(), etc
 
-#include <libbutl/filesystem.hxx>
+#include <libbutl/filesystem.mxx>
 
 #include <bpkg/types.hxx>
 #include <bpkg/version.hxx>
@@ -31,7 +31,7 @@ namespace bpkg
   using std::make_move_iterator;
   using std::to_string;
 
-  // <libbutl/utility.hxx>
+  // <libbutl/utility.mxx>
   //
   using butl::casecmp;
   using butl::reverse_iterate;
diff --git a/bpkg/wrapper-traits.hxx b/bpkg/wrapper-traits.hxx
index 1aed8ae..e617775 100644
--- a/bpkg/wrapper-traits.hxx
+++ b/bpkg/wrapper-traits.hxx
@@ -5,7 +5,7 @@
 #ifndef BPKG_WRAPPER_TRAITS_HXX
 #define BPKG_WRAPPER_TRAITS_HXX
 
-#include <libbutl/optional.hxx>
+#include <libbutl/optional.mxx>
 
 #include <odb/wrapper-traits.hxx>
 
-- 
cgit v1.1