aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2021-09-28 20:37:50 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2021-09-28 20:37:50 +0300
commit9d54661016b1e3d6ea3a6bc633bd657d25e99122 (patch)
tree66bd3478cd67dfb8ea257d1a888e2eea90dd2bdd
parentf3d9a26fe6b921ae45b6a4c38713b4ba20754f43 (diff)
Adapt to libbutl headers extension change from .mxx to .hxx
-rw-r--r--libbpkg/manifest.cxx18
-rw-r--r--libbpkg/manifest.hxx12
-rw-r--r--libbpkg/package-name.hxx2
-rw-r--r--tests/build-class-expr/driver.cxx4
-rw-r--r--tests/manifest/driver.cxx6
-rw-r--r--tests/overrides/driver.cxx6
-rw-r--r--tests/package-version/driver.cxx4
-rw-r--r--tests/repository-location/driver.cxx4
8 files changed, 28 insertions, 28 deletions
diff --git a/libbpkg/manifest.cxx b/libbpkg/manifest.cxx
index fdc2ee7..f1b50a3 100644
--- a/libbpkg/manifest.cxx
+++ b/libbpkg/manifest.cxx
@@ -13,16 +13,16 @@
#include <algorithm> // find(), find_if_not(), find_first_of(), replace()
#include <stdexcept> // invalid_argument
-#include <libbutl/url.mxx>
-#include <libbutl/path.mxx>
-#include <libbutl/base64.mxx>
-#include <libbutl/utility.mxx> // icasecmp(), lcase(), alnum(),
+#include <libbutl/url.hxx>
+#include <libbutl/path.hxx>
+#include <libbutl/base64.hxx>
+#include <libbutl/utility.hxx> // icasecmp(), lcase(), alnum(),
// digit(), xdigit(), next_word()
-#include <libbutl/filesystem.mxx> // dir_exist()
-#include <libbutl/small-vector.mxx>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
-#include <libbutl/standard-version.mxx>
+#include <libbutl/filesystem.hxx> // dir_exist()
+#include <libbutl/small-vector.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/standard-version.hxx>
using namespace std;
using namespace butl;
diff --git a/libbpkg/manifest.hxx b/libbpkg/manifest.hxx
index b6b9217..ca54cdc 100644
--- a/libbpkg/manifest.hxx
+++ b/libbpkg/manifest.hxx
@@ -14,10 +14,10 @@
#include <stdexcept> // logic_error
#include <functional>
-#include <libbutl/url.mxx>
-#include <libbutl/path.mxx>
-#include <libbutl/optional.mxx>
-#include <libbutl/small-vector.mxx>
+#include <libbutl/url.hxx>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/small-vector.hxx>
#include <libbutl/manifest-forward.hxx>
#include <libbpkg/package-name.hxx>
@@ -274,7 +274,7 @@ namespace bpkg
// - is not local (the scheme is not `file`)
// - authority is present and is not empty
//
- // See libbutl/url.mxx for details.
+ // See libbutl/url.hxx for details.
//
// NOTE: this class must not be DLL-exported wholesale (non-exported base).
//
@@ -829,7 +829,7 @@ namespace bpkg
// release, etc).
//
// In particular, the translation function may "patch" the version with
- // the snapshot information (see <libbutl/standard-version.mxx> for
+ // the snapshot information (see <libbutl/standard-version.hxx> for
// details). This translation is normally required for manifests of
// packages that are accessed as directories (as opposed to package
// archives that should have their version already patched).
diff --git a/libbpkg/package-name.hxx b/libbpkg/package-name.hxx
index 1828fa2..a47dc9a 100644
--- a/libbpkg/package-name.hxx
+++ b/libbpkg/package-name.hxx
@@ -4,7 +4,7 @@
#ifndef LIBBPKG_PACKAGE_NAME_HXX
#define LIBBPKG_PACKAGE_NAME_HXX
-#include <libbutl/project-name.mxx>
+#include <libbutl/project-name.hxx>
#include <libbpkg/export.hxx>
#include <libbpkg/version.hxx>
diff --git a/tests/build-class-expr/driver.cxx b/tests/build-class-expr/driver.cxx
index 5ff5f12..b2ee895 100644
--- a/tests/build-class-expr/driver.cxx
+++ b/tests/build-class-expr/driver.cxx
@@ -5,8 +5,8 @@
#include <string>
#include <iostream>
-#include <libbutl/utility.mxx> // eof(), operator<<(ostream, exception)
-#include <libbutl/optional.mxx>
+#include <libbutl/utility.hxx> // eof(), operator<<(ostream, exception)
+#include <libbutl/optional.hxx>
#include <libbpkg/manifest.hxx>
diff --git a/tests/manifest/driver.cxx b/tests/manifest/driver.cxx
index 2148ebb..44b1a79 100644
--- a/tests/manifest/driver.cxx
+++ b/tests/manifest/driver.cxx
@@ -5,9 +5,9 @@
#include <string>
#include <iostream>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
-#include <libbutl/standard-version.mxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
+#include <libbutl/standard-version.hxx>
#include <libbpkg/manifest.hxx>
diff --git a/tests/overrides/driver.cxx b/tests/overrides/driver.cxx
index f429b65..be3e0ff 100644
--- a/tests/overrides/driver.cxx
+++ b/tests/overrides/driver.cxx
@@ -8,9 +8,9 @@
#include <cstdint> // uint64_t
#include <iostream>
-#include <libbutl/utility.mxx> // trim()
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
+#include <libbutl/utility.hxx> // trim()
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
#include <libbpkg/manifest.hxx>
diff --git a/tests/package-version/driver.cxx b/tests/package-version/driver.cxx
index fc45c4d..0c84429 100644
--- a/tests/package-version/driver.cxx
+++ b/tests/package-version/driver.cxx
@@ -7,8 +7,8 @@
#include <exception>
#include <stdexcept> // invalid_argument
-#include <libbutl/utility.mxx> // operator<<(ostream, exception)
-#include <libbutl/optional.mxx>
+#include <libbutl/utility.hxx> // operator<<(ostream, exception)
+#include <libbutl/optional.hxx>
#include <libbpkg/manifest.hxx>
diff --git a/tests/repository-location/driver.cxx b/tests/repository-location/driver.cxx
index b0c7039..c93b257 100644
--- a/tests/repository-location/driver.cxx
+++ b/tests/repository-location/driver.cxx
@@ -6,8 +6,8 @@
#include <iostream>
#include <stdexcept> // invalid_argument, logic_error
-#include <libbutl/optional.mxx>
-#include <libbutl/manifest-parser.mxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/manifest-parser.hxx>
#include <libbpkg/manifest.hxx>