diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-05-01 17:23:45 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-05-01 17:32:27 +0300 |
commit | 662400d824ceab77cb4dc2d0163b4d48d210b3e1 (patch) | |
tree | 3d32e9473e723dcccd5c08a6d6266fbb23aa8973 | |
parent | a03e8a646b90d70b5c33e729b6e757a55a4ccdfd (diff) |
Adapt to adding hxx extension for headers and lib prefix for library dir in libbutl
-rw-r--r-- | libbrep/common.hxx | 4 | ||||
-rw-r--r-- | libbrep/types.hxx | 14 | ||||
-rw-r--r-- | libbrep/utility.hxx | 4 | ||||
-rw-r--r-- | libbrep/version.hxx.in | 2 | ||||
-rw-r--r-- | libbrep/wrapper-traits.hxx | 2 | ||||
-rw-r--r-- | load/load.cxx | 14 | ||||
-rw-r--r-- | migrate/migrate.cxx | 2 | ||||
-rw-r--r-- | mod/database-module.cxx | 2 | ||||
-rw-r--r-- | mod/mod-build-result.cxx | 8 | ||||
-rw-r--r-- | mod/mod-build-task.cxx | 8 | ||||
-rw-r--r-- | mod/mod-repository-details.cxx | 2 | ||||
-rw-r--r-- | tests/load/driver.cxx | 4 | ||||
-rw-r--r-- | web/apache/request.cxx | 4 | ||||
-rw-r--r-- | web/apache/service.cxx | 2 | ||||
-rw-r--r-- | web/module.hxx | 4 |
15 files changed, 38 insertions, 38 deletions
diff --git a/libbrep/common.hxx b/libbrep/common.hxx index b1160ab..942790c 100644 --- a/libbrep/common.hxx +++ b/libbrep/common.hxx @@ -108,8 +108,8 @@ namespace brep std::chrono::nanoseconds::period>::value, "The following timestamp ODB mapping is invalid"); - // As it pointed out in butl/timestamp we will overflow in year 2262, but - // by that time some larger basic type will be available for mapping. + // 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) \ to(std::chrono::duration_cast<std::chrono::nanoseconds> ( \ diff --git a/libbrep/types.hxx b/libbrep/types.hxx index a0001a7..7b74c75 100644 --- a/libbrep/types.hxx +++ b/libbrep/types.hxx @@ -22,10 +22,10 @@ #include <odb/lazy-ptr.hxx> -#include <butl/path> -#include <butl/path-io> -#include <butl/optional> -#include <butl/timestamp> +#include <libbutl/path.hxx> +#include <libbutl/path-io.hxx> +#include <libbutl/optional.hxx> +#include <libbutl/timestamp.hxx> namespace brep { @@ -65,7 +65,7 @@ namespace brep using std::system_error; using io_error = std::ios_base::failure; - // <butl/optional> + // <libbutl/optional.hxx> // using butl::optional; using butl::nullopt; @@ -75,7 +75,7 @@ namespace brep using odb::lazy_shared_ptr; using odb::lazy_weak_ptr; - // <butl/path> + // <libbutl/path.hxx> // 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>; - // <butl/timestamp> + // <libbutl/timestamp.hxx> // using butl::timestamp; using butl::timestamp_nonexistent; diff --git a/libbrep/utility.hxx b/libbrep/utility.hxx index f5948dd..c81413c 100644 --- a/libbrep/utility.hxx +++ b/libbrep/utility.hxx @@ -11,7 +11,7 @@ #include <cassert> // assert() #include <iterator> // make_move_iterator() -#include <butl/utility> // reverse_iterate(), operator<<(ostream, exception) +#include <libbutl/utility.hxx> // reverse_iterate(), operator<<(ostream, exception) namespace brep { @@ -24,7 +24,7 @@ namespace brep using std::make_move_iterator; using std::to_string; - // <butl/utility> + // <libbutl/utility.hxx> // using butl::reverse_iterate; } diff --git a/libbrep/version.hxx.in b/libbrep/version.hxx.in index 0b83777..e3c52ce 100644 --- a/libbrep/version.hxx.in +++ b/libbrep/version.hxx.in @@ -37,7 +37,7 @@ #define BREP_SNAPSHOT $brep.version.snapshot_sn$ULL #define BREP_SNAPSHOT_ID "$brep.version.snapshot_id$" -#include <butl/version> +#include <libbutl/version.hxx> $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$ diff --git a/libbrep/wrapper-traits.hxx b/libbrep/wrapper-traits.hxx index ac039e3..fcc63c6 100644 --- a/libbrep/wrapper-traits.hxx +++ b/libbrep/wrapper-traits.hxx @@ -7,7 +7,7 @@ #include <odb/pre.hxx> -#include <butl/optional> +#include <libbutl/optional.hxx> #include <odb/wrapper-traits.hxx> diff --git a/load/load.cxx b/load/load.cxx index b478086..23f365a 100644 --- a/load/load.cxx +++ b/load/load.cxx @@ -17,13 +17,13 @@ #include <odb/pgsql/database.hxx> -#include <butl/pager> -#include <butl/sha256> -#include <butl/process> -#include <butl/fdstream> -#include <butl/filesystem> -#include <butl/tab-parser> -#include <butl/manifest-parser> +#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 047dfe0..dac74d5 100644 --- a/migrate/migrate.cxx +++ b/migrate/migrate.cxx @@ -13,7 +13,7 @@ #include <odb/pgsql/database.hxx> -#include <butl/pager> +#include <libbutl/pager.hxx> #include <libbrep/types.hxx> #include <libbrep/utility.hxx> diff --git a/mod/database-module.cxx b/mod/database-module.cxx index 3b5e1e1..47cf03a 100644 --- a/mod/database-module.cxx +++ b/mod/database-module.cxx @@ -10,7 +10,7 @@ #include <odb/exceptions.hxx> -#include <butl/utility> // throw_generic_error() +#include <libbutl/utility.hxx> // throw_generic_error() #include <mod/options.hxx> #include <mod/database.hxx> diff --git a/mod/mod-build-result.cxx b/mod/mod-build-result.cxx index d6ec5e9..c6b789a 100644 --- a/mod/mod-build-result.cxx +++ b/mod/mod-build-result.cxx @@ -6,10 +6,10 @@ #include <algorithm> // find_if() -#include <butl/sendmail> -#include <butl/process-io> -#include <butl/manifest-parser> -#include <butl/manifest-serializer> +#include <libbutl/sendmail.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 353e636..e43397c 100644 --- a/mod/mod-build-task.cxx +++ b/mod/mod-build-task.cxx @@ -7,10 +7,10 @@ #include <map> #include <chrono> -#include <butl/utility> // compare_c_string -#include <butl/filesystem> // path_match() -#include <butl/manifest-parser> -#include <butl/manifest-serializer> +#include <libbutl/utility.hxx> // compare_c_string +#include <libbutl/filesystem.hxx> // path_match() +#include <libbutl/manifest-parser.hxx> +#include <libbutl/manifest-serializer.hxx> #include <libbbot/manifest.hxx> #include <libbbot/build-config.hxx> diff --git a/mod/mod-repository-details.cxx b/mod/mod-repository-details.cxx index 78b309d..e433e0a 100644 --- a/mod/mod-repository-details.cxx +++ b/mod/mod-repository-details.cxx @@ -14,7 +14,7 @@ #include <odb/database.hxx> #include <odb/transaction.hxx> -#include <butl/timestamp> +#include <libbutl/timestamp.hxx> #include <web/xhtml.hxx> #include <web/module.hxx> diff --git a/tests/load/driver.cxx b/tests/load/driver.cxx index 7c8662b..a907be1 100644 --- a/tests/load/driver.cxx +++ b/tests/load/driver.cxx @@ -11,8 +11,8 @@ #include <odb/pgsql/database.hxx> -#include <butl/process> -#include <butl/filesystem> +#include <libbutl/process.hxx> +#include <libbutl/filesystem.hxx> #include <libbrep/types.hxx> #include <libbrep/utility.hxx> diff --git a/web/apache/request.cxx b/web/apache/request.cxx index 219f887..da016b5 100644 --- a/web/apache/request.cxx +++ b/web/apache/request.cxx @@ -28,8 +28,8 @@ #include <streambuf> #include <algorithm> // min() -#include <butl/optional> -#include <butl/timestamp> +#include <libbutl/optional.hxx> +#include <libbutl/timestamp.hxx> #include <web/mime-url-encoding.hxx> diff --git a/web/apache/service.cxx b/web/apache/service.cxx index 8c3fa82..5a8e757 100644 --- a/web/apache/service.cxx +++ b/web/apache/service.cxx @@ -16,7 +16,7 @@ #include <cstring> // strlen(), strcmp() #include <exception> -#include <butl/optional> +#include <libbutl/optional.hxx> #include <web/module.hxx> #include <web/apache/log.hxx> diff --git a/web/module.hxx b/web/module.hxx index 1864673..a771641 100644 --- a/web/module.hxx +++ b/web/module.hxx @@ -15,8 +15,8 @@ #include <utility> // move() #include <stdexcept> // runtime_error -#include <butl/path> -#include <butl/optional> +#include <libbutl/path.hxx> +#include <libbutl/optional.hxx> namespace web { |