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

---
 clean/clean.cxx                     |  2 +-
 libbrep/build.hxx                   |  2 +-
 libbrep/common.hxx                  |  2 +-
 libbrep/types.hxx                   | 14 +++++++-------
 libbrep/utility.hxx                 |  4 ++--
 libbrep/wrapper-traits.hxx          |  2 +-
 load/load.cxx                       | 14 +++++++-------
 migrate/migrate.cxx                 |  2 +-
 mod/build-config.cxx                |  8 ++++----
 mod/database-module.cxx             |  2 +-
 mod/database-module.hxx             |  2 +-
 mod/mod-build-log.cxx               |  2 +-
 mod/mod-build-result.cxx            | 12 ++++++------
 mod/mod-build-task.cxx              | 16 ++++++++--------
 mod/mod-builds.cxx                  |  4 ++--
 mod/mod-package-version-details.cxx |  2 +-
 mod/mod-repository-details.cxx      |  2 +-
 tests/load/driver.cxx               |  4 ++--
 web/apache/request.cxx              |  4 ++--
 web/apache/service.cxx              |  2 +-
 web/apache/service.txx              |  2 ++
 web/module.hxx                      |  4 ++--
 22 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/clean/clean.cxx b/clean/clean.cxx
index bec297b..fa6d08c 100644
--- a/clean/clean.cxx
+++ b/clean/clean.cxx
@@ -11,7 +11,7 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.hxx>
+#include <libbutl/pager.mxx>
 
 #include <libbbot/build-config.hxx>
 
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index dda9b43..715815f 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -10,7 +10,7 @@
 #include <odb/core.hxx>
 #include <odb/section.hxx>
 
-#include <libbutl/target-triplet.hxx>
+#include <libbutl/target-triplet.mxx>
 
 #include <libbbot/manifest.hxx>
 
diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index 56d6768..581784d 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -108,7 +108,7 @@ namespace brep
                              std::chrono::nanoseconds::period>::value,
     "The following timestamp ODB mapping is invalid");
 
-  // As it pointed out in libbutl/timestamp.hxx we will overflow in year 2262,
+  // As it 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/libbrep/types.hxx b/libbrep/types.hxx
index 674b888..b4a3b19 100644
--- a/libbrep/types.hxx
+++ b/libbrep/types.hxx
@@ -22,10 +22,10 @@
 
 #include <odb/lazy-ptr.hxx>
 
-#include <libbutl/path.hxx>
-#include <libbutl/path-io.hxx>
-#include <libbutl/optional.hxx>
-#include <libbutl/timestamp.hxx>
+#include <libbutl/path.mxx>
+#include <libbutl/path-io.mxx>
+#include <libbutl/optional.mxx>
+#include <libbutl/timestamp.mxx>
 
 namespace brep
 {
@@ -65,7 +65,7 @@ namespace brep
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <libbutl/optional.hxx>
+  // <libbutl/optional.mxx>
   //
   using butl::optional;
   using butl::nullopt;
@@ -75,7 +75,7 @@ namespace brep
   using odb::lazy_shared_ptr;
   using odb::lazy_weak_ptr;
 
-  // <libbutl/path.hxx>
+  // <libbutl/path.mxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -85,7 +85,7 @@ namespace brep
   using paths = std::vector<path>;
   using dir_paths = std::vector<dir_path>;
 
-  // <libbutl/timestamp.hxx>
+  // <libbutl/timestamp.mxx>
   //
   using butl::system_clock;
   using butl::timestamp;
diff --git a/libbrep/utility.hxx b/libbrep/utility.hxx
index 1900bc4..65c0b46 100644
--- a/libbrep/utility.hxx
+++ b/libbrep/utility.hxx
@@ -11,7 +11,7 @@
 #include <cassert>  // assert()
 #include <iterator> // make_move_iterator()
 
-#include <libbutl/utility.hxx> // reverse_iterate(),
+#include <libbutl/utility.mxx> // reverse_iterate(),
                                // operator<<(ostream, exception)
 
 namespace brep
@@ -25,7 +25,7 @@ namespace brep
   using std::make_move_iterator;
   using std::to_string;
 
-  // <libbutl/utility.hxx>
+  // <libbutl/utility.mxx>
   //
   using butl::reverse_iterate;
 }
diff --git a/libbrep/wrapper-traits.hxx b/libbrep/wrapper-traits.hxx
index fcc63c6..70c84e0 100644
--- a/libbrep/wrapper-traits.hxx
+++ b/libbrep/wrapper-traits.hxx
@@ -7,7 +7,7 @@
 
 #include <odb/pre.hxx>
 
-#include <libbutl/optional.hxx>
+#include <libbutl/optional.mxx>
 
 #include <odb/wrapper-traits.hxx>
 
diff --git a/load/load.cxx b/load/load.cxx
index 759dc61..3dbf2fb 100644
--- a/load/load.cxx
+++ b/load/load.cxx
@@ -17,13 +17,13 @@
 
 #include <odb/pgsql/database.hxx>
 
-#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 <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 <libbpkg/manifest.hxx>
 
diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx
index 0fde937..95d47fd 100644
--- a/migrate/migrate.cxx
+++ b/migrate/migrate.cxx
@@ -13,7 +13,7 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/pager.hxx>
+#include <libbutl/pager.mxx>
 
 #include <libbrep/database-lock.hxx>
 
diff --git a/mod/build-config.cxx b/mod/build-config.cxx
index 1ac4939..aa25511 100644
--- a/mod/build-config.cxx
+++ b/mod/build-config.cxx
@@ -7,10 +7,10 @@
 #include <map>
 #include <sstream>
 
-#include <libbutl/sha256.hxx>
-#include <libbutl/utility.hxx>    // throw_generic_error()
-#include <libbutl/openssl.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/sha256.mxx>
+#include <libbutl/utility.mxx>    // throw_generic_error()
+#include <libbutl/openssl.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <web/mime-url-encoding.hxx>
 
diff --git a/mod/database-module.cxx b/mod/database-module.cxx
index ab39a18..99ab4b3 100644
--- a/mod/database-module.cxx
+++ b/mod/database-module.cxx
@@ -10,7 +10,7 @@
 
 #include <odb/exceptions.hxx>
 
-#include <libbutl/utility.hxx> // throw_generic_error()
+#include <libbutl/utility.mxx> // throw_generic_error()
 
 #include <mod/options.hxx>
 #include <mod/database.hxx>
diff --git a/mod/database-module.hxx b/mod/database-module.hxx
index ec8f37e..f4730bd 100644
--- a/mod/database-module.hxx
+++ b/mod/database-module.hxx
@@ -9,7 +9,7 @@
 
 #include <odb/forward.hxx> // database
 
-#include <libbutl/utility.hxx> // compare_c_string
+#include <libbutl/utility.mxx> // compare_c_string
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
diff --git a/mod/mod-build-log.cxx b/mod/mod-build-log.cxx
index b667c08..56151c3 100644
--- a/mod/mod-build-log.cxx
+++ b/mod/mod-build-log.cxx
@@ -9,7 +9,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/timestamp.hxx> // to_stream()
+#include <libbutl/timestamp.mxx> // to_stream()
 
 #include <web/module.hxx>
 
diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx
index 6cf94b0..f93d2a0 100644
--- a/mod/mod-build-result.cxx
+++ b/mod/mod-build-result.cxx
@@ -7,12 +7,12 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#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 <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 <libbbot/manifest.hxx>
 
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index 55cfd5b..e498eda 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -11,14 +11,14 @@
 #include <odb/transaction.hxx>
 #include <odb/schema-catalog.hxx>
 
-#include <libbutl/sha256.hxx>
-#include <libbutl/utility.hxx>             // compare_c_string
-#include <libbutl/openssl.hxx>
-#include <libbutl/fdstream.hxx>            // nullfd
-#include <libbutl/filesystem.hxx>          // path_match()
-#include <libbutl/process-io.hxx>
-#include <libbutl/manifest-parser.hxx>
-#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/sha256.mxx>
+#include <libbutl/utility.mxx>             // compare_c_string
+#include <libbutl/openssl.mxx>
+#include <libbutl/fdstream.mxx>            // nullfd
+#include <libbutl/filesystem.mxx>          // path_match()
+#include <libbutl/process-io.mxx>
+#include <libbutl/manifest-parser.mxx>
+#include <libbutl/manifest-serializer.mxx>
 
 #include <libbbot/manifest.hxx>
 #include <libbbot/build-config.hxx>
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx
index 04094e5..1b614ad 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.hxx>  // to_string()
-#include <libbutl/filesystem.hxx> // path_match()
+#include <libbutl/timestamp.mxx>  // to_string()
+#include <libbutl/filesystem.mxx> // path_match()
 
 #include <libbbot/manifest.hxx> // to_result_status(), to_string(result_status)
 
diff --git a/mod/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx
index d0d5978..134fb9a 100644
--- a/mod/mod-package-version-details.cxx
+++ b/mod/mod-package-version-details.cxx
@@ -10,7 +10,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/utility.hxx> // alpha(), ucase(), lcase()
+#include <libbutl/utility.mxx> // alpha(), ucase(), lcase()
 
 #include <web/xhtml.hxx>
 #include <web/module.hxx>
diff --git a/mod/mod-repository-details.cxx b/mod/mod-repository-details.cxx
index b8b88bc..177f49d 100644
--- a/mod/mod-repository-details.cxx
+++ b/mod/mod-repository-details.cxx
@@ -11,7 +11,7 @@
 #include <odb/database.hxx>
 #include <odb/transaction.hxx>
 
-#include <libbutl/timestamp.hxx> // to_string()
+#include <libbutl/timestamp.mxx> // to_string()
 
 #include <web/xhtml.hxx>
 #include <web/module.hxx>
diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx
index d1283f3..dab5be9 100644
--- a/tests/load/driver.cxx
+++ b/tests/load/driver.cxx
@@ -11,8 +11,8 @@
 
 #include <odb/pgsql/database.hxx>
 
-#include <libbutl/process.hxx>
-#include <libbutl/filesystem.hxx>
+#include <libbutl/process.mxx>
+#include <libbutl/filesystem.mxx>
 
 #include <libbrep/types.hxx>
 #include <libbrep/utility.hxx>
diff --git a/web/apache/request.cxx b/web/apache/request.cxx
index 78e0fc0..3393555 100644
--- a/web/apache/request.cxx
+++ b/web/apache/request.cxx
@@ -28,8 +28,8 @@
 #include <streambuf>
 #include <algorithm> // min()
 
-#include <libbutl/optional.hxx>
-#include <libbutl/timestamp.hxx>
+#include <libbutl/optional.mxx>
+#include <libbutl/timestamp.mxx>
 
 #include <web/mime-url-encoding.hxx>
 
diff --git a/web/apache/service.cxx b/web/apache/service.cxx
index 5a8e757..f42cc2e 100644
--- a/web/apache/service.cxx
+++ b/web/apache/service.cxx
@@ -16,7 +16,7 @@
 #include <cstring>   // strlen(), strcmp()
 #include <exception>
 
-#include <libbutl/optional.hxx>
+#include <libbutl/optional.mxx>
 
 #include <web/module.hxx>
 #include <web/apache/log.hxx>
diff --git a/web/apache/service.txx b/web/apache/service.txx
index b707f8d..61b95f3 100644
--- a/web/apache/service.txx
+++ b/web/apache/service.txx
@@ -9,6 +9,8 @@
 #include <utility>   // move()
 #include <exception>
 
+#include <libbutl/utility.mxx> // operator<<(ostream, exception)
+
 namespace web
 {
   namespace apache
diff --git a/web/module.hxx b/web/module.hxx
index a771641..0308b68 100644
--- a/web/module.hxx
+++ b/web/module.hxx
@@ -15,8 +15,8 @@
 #include <utility>   // move()
 #include <stdexcept> // runtime_error
 
-#include <libbutl/path.hxx>
-#include <libbutl/optional.hxx>
+#include <libbutl/path.mxx>
+#include <libbutl/optional.mxx>
 
 namespace web
 {
-- 
cgit v1.1