diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-06-03 13:00:59 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-06-03 13:00:59 +0300 |
| commit | 536436b4965d37d6b8548abd40574de7b33c57ae (patch) | |
| tree | 0f8cd9dc5500fafe680b3fdcefdafc813ff913c8 | |
| parent | e6de9801b4b38c9b5d01016e43149f507a063f68 (diff) | |
Adapt to renaming traits alias to traits_type for basic_path, basic_url, and string_table class templates
| -rw-r--r-- | bpkg/auth.cxx | 3 | ||||
| -rw-r--r-- | bpkg/pkg-build.cxx | 4 | ||||
| -rw-r--r-- | bpkg/types.hxx | 2 | ||||
| -rw-r--r-- | bpkg/utility.cxx | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/bpkg/auth.cxx b/bpkg/auth.cxx index 928eb67..3fcb24b 100644 --- a/bpkg/auth.cxx +++ b/bpkg/auth.cxx @@ -885,7 +885,8 @@ namespace bpkg { tracer trace ("sign_repository"); - string r (repository.string () + dir_path::traits::directory_separator); + string r (repository.string () + + dir_path::traits_type::directory_separator); // No sense to calculate the fingerprint for the certificate being used // just to check the expiration date. diff --git a/bpkg/pkg-build.cxx b/bpkg/pkg-build.cxx index 73a4d5b..590dbe9 100644 --- a/bpkg/pkg-build.cxx +++ b/bpkg/pkg-build.cxx @@ -2626,7 +2626,7 @@ namespace bpkg // size_t p (0); - using url_traits = butl::url::traits; + using url_traits = butl::url::traits_type; // Skip leading ':' that are not part of a URL. // @@ -3210,7 +3210,7 @@ namespace bpkg // the directory separator. // size_t pn (strlen (package)); - if (pn != 0 && path::traits::is_separator (package[pn - 1])) + if (pn != 0 && path::traits_type::is_separator (package[pn - 1])) { bool package_dir (false); diff --git a/bpkg/types.hxx b/bpkg/types.hxx index f36a33c..eaf07d2 100644 --- a/bpkg/types.hxx +++ b/bpkg/types.hxx @@ -122,7 +122,7 @@ namespace std operator<< (ostream& os, const ::butl::path& p) { string r (p.representation ()); - ::butl::path::traits::canonicalize (r); + ::butl::path::traits_type::canonicalize (r); return os << r; } } diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx index 74c1350..91fc49e 100644 --- a/bpkg/utility.cxx +++ b/bpkg/utility.cxx @@ -38,14 +38,14 @@ namespace bpkg tmp_file (const string& p) { assert (!temp_dir.empty ()); - return auto_rmfile (temp_dir / path::traits::temp_name (p)); + return auto_rmfile (temp_dir / path::traits_type::temp_name (p)); } auto_rmdir tmp_dir (const string& p) { assert (!temp_dir.empty ()); - return auto_rmdir (temp_dir / dir_path (path::traits::temp_name (p))); + return auto_rmdir (temp_dir / dir_path (path::traits_type::temp_name (p))); } void |