diff options
-rw-r--r-- | bpkg/auth.cxx | 10 | ||||
-rw-r--r-- | bpkg/bpkg.cxx | 2 | ||||
-rw-r--r-- | bpkg/checksum.hxx | 2 | ||||
-rw-r--r-- | bpkg/database.cxx | 2 | ||||
-rw-r--r-- | bpkg/diagnostics.cxx | 4 | ||||
-rw-r--r-- | bpkg/diagnostics.hxx | 2 | ||||
-rw-r--r-- | bpkg/fetch-git.cxx | 12 | ||||
-rw-r--r-- | bpkg/fetch-pkg.cxx | 4 | ||||
-rw-r--r-- | bpkg/help.cxx | 2 | ||||
-rw-r--r-- | bpkg/manifest-utility.cxx | 4 | ||||
-rw-r--r-- | bpkg/manifest-utility.hxx | 2 | ||||
-rw-r--r-- | bpkg/package.hxx | 4 | ||||
-rw-r--r-- | bpkg/pkg-build.cxx | 4 | ||||
-rw-r--r-- | bpkg/pkg-command.cxx | 2 | ||||
-rw-r--r-- | bpkg/pkg-verify.cxx | 4 | ||||
-rw-r--r-- | bpkg/rep-create.cxx | 4 | ||||
-rw-r--r-- | bpkg/rep-fetch.cxx | 2 | ||||
-rw-r--r-- | bpkg/rep-info.cxx | 4 | ||||
-rw-r--r-- | bpkg/rep-remove.cxx | 2 | ||||
-rw-r--r-- | bpkg/types.hxx | 38 | ||||
-rw-r--r-- | bpkg/utility.cxx | 4 | ||||
-rw-r--r-- | bpkg/utility.hxx | 16 | ||||
-rw-r--r-- | bpkg/wrapper-traits.hxx | 2 |
23 files changed, 66 insertions, 66 deletions
diff --git a/bpkg/auth.cxx b/bpkg/auth.cxx index ca187ed..93c88f5 100644 --- a/bpkg/auth.cxx +++ b/bpkg/auth.cxx @@ -7,11 +7,11 @@ #include <limits> // numeric_limits #include <iterator> // ostreambuf_iterator -#include <libbutl/sha256.mxx> -#include <libbutl/base64.mxx> -#include <libbutl/openssl.mxx> -#include <libbutl/timestamp.mxx> -#include <libbutl/filesystem.mxx> +#include <libbutl/sha256.hxx> +#include <libbutl/base64.hxx> +#include <libbutl/openssl.hxx> +#include <libbutl/timestamp.hxx> +#include <libbutl/filesystem.hxx> #include <bpkg/package.hxx> #include <bpkg/package-odb.hxx> diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx index 1abe037..92f4bb9 100644 --- a/bpkg/bpkg.cxx +++ b/bpkg/bpkg.cxx @@ -10,7 +10,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 <bpkg/types.hxx> #include <bpkg/utility.hxx> diff --git a/bpkg/checksum.hxx b/bpkg/checksum.hxx index fdf6fe5..73f52e8 100644 --- a/bpkg/checksum.hxx +++ b/bpkg/checksum.hxx @@ -4,7 +4,7 @@ #ifndef BPKG_CHECKSUM_HXX #define BPKG_CHECKSUM_HXX -#include <libbutl/sha256.mxx> +#include <libbutl/sha256.hxx> #include <bpkg/types.hxx> #include <bpkg/utility.hxx> diff --git a/bpkg/database.cxx b/bpkg/database.cxx index aec3459..dd6790a 100644 --- a/bpkg/database.cxx +++ b/bpkg/database.cxx @@ -8,7 +8,7 @@ #include <odb/schema-catalog.hxx> #include <odb/sqlite/exceptions.hxx> -#include <libbutl/sha256.mxx> +#include <libbutl/sha256.hxx> #include <bpkg/package.hxx> #include <bpkg/package-odb.hxx> diff --git a/bpkg/diagnostics.cxx b/bpkg/diagnostics.cxx index a471d07..ef87cab 100644 --- a/bpkg/diagnostics.cxx +++ b/bpkg/diagnostics.cxx @@ -7,8 +7,8 @@ #include <odb/statement.hxx> -#include <libbutl/process.mxx> // process_args -#include <libbutl/process-io.mxx> // operator<<(ostream, process_*) +#include <libbutl/process.hxx> // process_args +#include <libbutl/process-io.hxx> // operator<<(ostream, process_*) #include <bpkg/utility.hxx> diff --git a/bpkg/diagnostics.hxx b/bpkg/diagnostics.hxx index 72fc9ae..6090331 100644 --- a/bpkg/diagnostics.hxx +++ b/bpkg/diagnostics.hxx @@ -8,7 +8,7 @@ #include <odb/tracer.hxx> -#include <libbutl/diagnostics.mxx> +#include <libbutl/diagnostics.hxx> #include <bpkg/types.hxx> // Note: not <bpkg/utility.hxx> diff --git a/bpkg/fetch-git.cxx b/bpkg/fetch-git.cxx index 8195375..5c63ea2 100644 --- a/bpkg/fetch-git.cxx +++ b/bpkg/fetch-git.cxx @@ -5,11 +5,11 @@ #include <map> -#include <libbutl/git.mxx> -#include <libbutl/filesystem.mxx> // path_entry -#include <libbutl/path-pattern.mxx> -#include <libbutl/semantic-version.mxx> -#include <libbutl/standard-version.mxx> // parse_standard_version() +#include <libbutl/git.hxx> +#include <libbutl/filesystem.hxx> // path_entry +#include <libbutl/path-pattern.hxx> +#include <libbutl/semantic-version.hxx> +#include <libbutl/standard-version.hxx> // parse_standard_version() #include <bpkg/diagnostics.hxx> @@ -2364,7 +2364,7 @@ namespace bpkg // "elevated console mode": // // - file symlinks are currently not supported (see - // libbutl/filesystem.mxx for details). + // libbutl/filesystem.hxx for details). // // - git creates symlinks to directories, rather than junctions. This // makes things to fall apart as Windows API seems to be unable to diff --git a/bpkg/fetch-pkg.cxx b/bpkg/fetch-pkg.cxx index 81d4131..6d9e921 100644 --- a/bpkg/fetch-pkg.cxx +++ b/bpkg/fetch-pkg.cxx @@ -5,8 +5,8 @@ #include <sstream> -#include <libbutl/filesystem.mxx> // cpfile () -#include <libbutl/manifest-parser.mxx> +#include <libbutl/filesystem.hxx> // cpfile () +#include <libbutl/manifest-parser.hxx> #include <bpkg/checksum.hxx> #include <bpkg/diagnostics.hxx> diff --git a/bpkg/help.cxx b/bpkg/help.cxx index 20b3805..ed0f58a 100644 --- a/bpkg/help.cxx +++ b/bpkg/help.cxx @@ -3,7 +3,7 @@ #include <bpkg/help.hxx> -#include <libbutl/pager.mxx> +#include <libbutl/pager.hxx> #include <bpkg/diagnostics.hxx> #include <bpkg/bpkg-options.hxx> diff --git a/bpkg/manifest-utility.cxx b/bpkg/manifest-utility.cxx index 9b8cbca..bad4659 100644 --- a/bpkg/manifest-utility.cxx +++ b/bpkg/manifest-utility.cxx @@ -5,8 +5,8 @@ #include <cstring> // strcspn() -#include <libbutl/b.mxx> -#include <libbutl/sha256.mxx> +#include <libbutl/b.hxx> +#include <libbutl/sha256.hxx> #include <bpkg/package.hxx> // wildcard_version #include <bpkg/diagnostics.hxx> diff --git a/bpkg/manifest-utility.hxx b/bpkg/manifest-utility.hxx index 8ef517e..69d8326 100644 --- a/bpkg/manifest-utility.hxx +++ b/bpkg/manifest-utility.hxx @@ -118,7 +118,7 @@ namespace bpkg // // Note that if a package directory is under the version control, then the // resulting version may be populated with the snapshot information (see - // libbutl/standard-version.mxx for more details). Thus, this function can + // libbutl/standard-version.hxx for more details). Thus, this function can // be used for fixing up the package manifest versions. // class common_options; diff --git a/bpkg/package.hxx b/bpkg/package.hxx index 9a42f62..22d30a5 100644 --- a/bpkg/package.hxx +++ b/bpkg/package.hxx @@ -13,7 +13,7 @@ #include <odb/core.hxx> #include <odb/nested-container.hxx> -#include <libbutl/timestamp.mxx> +#include <libbutl/timestamp.hxx> #include <libbpkg/package-name.hxx> @@ -73,7 +73,7 @@ namespace bpkg std::chrono::nanoseconds::period>::value, "The following timestamp ODB mapping is invalid"); - // As pointed out in libbutl/timestamp.mxx we will overflow in year 2262, but + // As 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/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 6661109..51bd224 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -9,8 +9,8 @@ #include <cstring> // strlen() #include <iostream> // cout -#include <libbutl/sha256.mxx> -#include <libbutl/standard-version.mxx> +#include <libbutl/sha256.hxx> +#include <libbutl/standard-version.hxx> #include <bpkg/package.hxx> #include <bpkg/package-odb.hxx> diff --git a/bpkg/pkg-command.cxx b/bpkg/pkg-command.cxx index 6bec97b..668aca1 100644 --- a/bpkg/pkg-command.cxx +++ b/bpkg/pkg-command.cxx @@ -3,7 +3,7 @@ #include <bpkg/pkg-command.hxx> -#include <libbutl/path-pattern.mxx> +#include <libbutl/path-pattern.hxx> #include <bpkg/package.hxx> #include <bpkg/package-odb.hxx> diff --git a/bpkg/pkg-verify.cxx b/bpkg/pkg-verify.cxx index 03f854e..aae1b43 100644 --- a/bpkg/pkg-verify.cxx +++ b/bpkg/pkg-verify.cxx @@ -5,8 +5,8 @@ #include <iostream> // cout -#include <libbutl/manifest-parser.mxx> -#include <libbutl/manifest-serializer.mxx> +#include <libbutl/manifest-parser.hxx> +#include <libbutl/manifest-serializer.hxx> #include <bpkg/archive.hxx> #include <bpkg/diagnostics.hxx> diff --git a/bpkg/rep-create.cxx b/bpkg/rep-create.cxx index f47bc09..d820836 100644 --- a/bpkg/rep-create.cxx +++ b/bpkg/rep-create.cxx @@ -5,8 +5,8 @@ #include <map> -#include <libbutl/filesystem.mxx> // dir_iterator -#include <libbutl/manifest-serializer.mxx> +#include <libbutl/filesystem.hxx> // dir_iterator +#include <libbutl/manifest-serializer.hxx> #include <libbpkg/manifest.hxx> #include <libbpkg/package-name.hxx> diff --git a/bpkg/rep-fetch.cxx b/bpkg/rep-fetch.cxx index d2931ca..73c9058 100644 --- a/bpkg/rep-fetch.cxx +++ b/bpkg/rep-fetch.cxx @@ -6,7 +6,7 @@ #include <map> #include <set> -#include <libbutl/manifest-parser.mxx> +#include <libbutl/manifest-parser.hxx> #include <bpkg/auth.hxx> #include <bpkg/fetch.hxx> diff --git a/bpkg/rep-info.cxx b/bpkg/rep-info.cxx index 0000557..a5d79eb 100644 --- a/bpkg/rep-info.cxx +++ b/bpkg/rep-info.cxx @@ -5,8 +5,8 @@ #include <iostream> // cout -#include <libbutl/sha256.mxx> // sha256_to_fingerprint() -#include <libbutl/manifest-serializer.mxx> +#include <libbutl/sha256.hxx> // sha256_to_fingerprint() +#include <libbutl/manifest-serializer.hxx> #include <libbpkg/manifest.hxx> diff --git a/bpkg/rep-remove.cxx b/bpkg/rep-remove.cxx index 5dab94b..601d291 100644 --- a/bpkg/rep-remove.cxx +++ b/bpkg/rep-remove.cxx @@ -5,7 +5,7 @@ #include <set> -#include <libbutl/filesystem.mxx> // dir_iterator +#include <libbutl/filesystem.hxx> // dir_iterator #include <bpkg/package.hxx> #include <bpkg/package-odb.hxx> diff --git a/bpkg/types.hxx b/bpkg/types.hxx index 8f6d9df..a8cd0f4 100644 --- a/bpkg/types.hxx +++ b/bpkg/types.hxx @@ -21,18 +21,18 @@ #include <odb/lazy-ptr.hxx> -#include <libbutl/b.mxx> -#include <libbutl/url.mxx> -#include <libbutl/path.mxx> +#include <libbutl/b.hxx> +#include <libbutl/url.hxx> +#include <libbutl/path.hxx> #include <libbutl/uuid.hxx> #include <libbutl/uuid-io.hxx> -#include <libbutl/process.mxx> -#include <libbutl/utility.mxx> // icase_compare_string, +#include <libbutl/process.hxx> +#include <libbutl/utility.hxx> // icase_compare_string, // compare_reference_target -#include <libbutl/optional.mxx> -#include <libbutl/fdstream.mxx> -#include <libbutl/small-vector.mxx> -#include <libbutl/default-options.mxx> +#include <libbutl/optional.hxx> +#include <libbutl/fdstream.hxx> +#include <libbutl/small-vector.hxx> +#include <libbutl/default-options.hxx> namespace bpkg { @@ -56,7 +56,7 @@ namespace bpkg 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*>; @@ -73,17 +73,17 @@ namespace bpkg using std::system_error; using io_error = std::ios_base::failure; - // <libbutl/utility.mxx> + // <libbutl/utility.hxx> // using butl::icase_compare_string; using butl::compare_reference_target; - // <libbutl/optional.mxx> + // <libbutl/optional.hxx> // using butl::optional; using butl::nullopt; - // <libbutl/path.mxx> + // <libbutl/path.hxx> // using butl::path; using butl::dir_path; @@ -95,15 +95,15 @@ namespace bpkg using paths = vector<path>; using dir_paths = vector<dir_path>; - // <libbutl/uuid.mxx> + // <libbutl/uuid.hxx> // using butl::uuid; - // <libbutl/url.mxx> + // <libbutl/url.hxx> // using butl::url; - // <libbutl/process.mxx> + // <libbutl/process.hxx> // using butl::process; using butl::process_env; @@ -111,7 +111,7 @@ namespace bpkg using butl::process_exit; using butl::process_error; - // <libbutl/fdstream.mxx> + // <libbutl/fdstream.hxx> // using butl::auto_fd; using butl::nullfd; @@ -120,13 +120,13 @@ namespace bpkg using butl::ofdstream; 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/b.mxx> + // <libbutl/b.hxx> // using package_info = butl::b_project_info; diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx index 39dea81..4d72d7b 100644 --- a/bpkg/utility.cxx +++ b/bpkg/utility.cxx @@ -3,8 +3,8 @@ #include <bpkg/utility.hxx> -#include <libbutl/prompt.mxx> -#include <libbutl/fdstream.mxx> +#include <libbutl/prompt.hxx> +#include <libbutl/fdstream.hxx> #include <bpkg/diagnostics.hxx> #include <bpkg/common-options.hxx> diff --git a/bpkg/utility.hxx b/bpkg/utility.hxx index dabffbe..1f6027d 100644 --- a/bpkg/utility.hxx +++ b/bpkg/utility.hxx @@ -15,10 +15,10 @@ #include <libbutl/ft/lang.hxx> -#include <libbutl/utility.mxx> // icasecmp(), reverse_iterate(), etc -#include <libbutl/process.mxx> -#include <libbutl/filesystem.mxx> -#include <libbutl/default-options.mxx> +#include <libbutl/utility.hxx> // icasecmp(), reverse_iterate(), etc +#include <libbutl/process.hxx> +#include <libbutl/filesystem.hxx> +#include <libbutl/default-options.hxx> #include <bpkg/types.hxx> #include <bpkg/version.hxx> @@ -38,7 +38,7 @@ namespace bpkg using std::strcmp; using std::strchr; - // <libbutl/utility.mxx> + // <libbutl/utility.hxx> // using butl::icasecmp; using butl::reverse_iterate; @@ -55,16 +55,16 @@ namespace bpkg using butl::setenv; using butl::unsetenv; - // <libbutl/process.mxx> + // <libbutl/process.hxx> // using butl::process_start_callback; - // <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/bpkg/wrapper-traits.hxx b/bpkg/wrapper-traits.hxx index 0288a9d..668c171 100644 --- a/bpkg/wrapper-traits.hxx +++ b/bpkg/wrapper-traits.hxx @@ -4,7 +4,7 @@ #ifndef BPKG_WRAPPER_TRAITS_HXX #define BPKG_WRAPPER_TRAITS_HXX -#include <libbutl/optional.mxx> +#include <libbutl/optional.hxx> #include <odb/wrapper-traits.hxx> |