aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bdep/ci.cxx2
-rw-r--r--bdep/git.cxx8
-rw-r--r--bdep/release.cxx2
-rw-r--r--bdep/sync.cxx4
-rw-r--r--bdep/types.hxx2
-rw-r--r--bdep/utility.cxx4
6 files changed, 11 insertions, 11 deletions
diff --git a/bdep/ci.cxx b/bdep/ci.cxx
index 8c45a11..08f2578 100644
--- a/bdep/ci.cxx
+++ b/bdep/ci.cxx
@@ -75,7 +75,7 @@ namespace bdep
<< s.branch << "'" <<
info << "run 'git push --set-upstream' to set";
- size_t p (path::traits::rfind_separator (s.upstream));
+ size_t p (path::traits_type::rfind_separator (s.upstream));
branch = p != string::npos ? string (s.upstream, p + 1) : s.upstream;
// Note: not forcible (for now). While the use case is valid, the
diff --git a/bdep/git.cxx b/bdep/git.cxx
index 9509275..6b23342 100644
--- a/bdep/git.cxx
+++ b/bdep/git.cxx
@@ -173,9 +173,9 @@ namespace bdep
// the schemes recognized by git currently do and probably never will).
//
size_t p (s.find (':'));
- if (p != string::npos && // Has ':'.
- url::traits::find (s, p) == 0 && // Scheme starts at 0.
- s.rfind ('.', p - 1) == string::npos) // No dots in scheme.
+ if (p != string::npos && // Has ':'.
+ url::traits_type::find (s, p) == 0 && // Scheme starts at 0.
+ s.rfind ('.', p - 1) == string::npos) // No dots in scheme.
{
u = parse_url (s, "remote.origin.url");
}
@@ -183,7 +183,7 @@ namespace bdep
{
// Absolute path or the SSH thing.
//
- if (path::traits::absolute (s))
+ if (path::traits_type::absolute (s))
{
// This is what we want to end up with:
//
diff --git a/bdep/release.cxx b/bdep/release.cxx
index d82e978..f6615ab 100644
--- a/bdep/release.cxx
+++ b/bdep/release.cxx
@@ -1083,7 +1083,7 @@ namespace bdep
string remote;
string brspec;
{
- size_t p (path::traits::rfind_separator (st.upstream));
+ size_t p (path::traits_type::rfind_separator (st.upstream));
if (p == string::npos)
fail << "unable to extract remote from '" << st.upstream << "'";
diff --git a/bdep/sync.cxx b/bdep/sync.cxx
index f8df4dc..cb85e98 100644
--- a/bdep/sync.cxx
+++ b/bdep/sync.cxx
@@ -546,8 +546,8 @@ namespace bdep
// Both paths are normilized so we can just compare them as
// strings.
//
- if (path::traits::compare (v.c_str () + b, n,
- p.c_str (), p.size ()) == 0)
+ if (path::traits_type::compare (v.c_str () + b, n,
+ p.c_str (), p.size ()) == 0)
{
if (implicit)
return true;
diff --git a/bdep/types.hxx b/bdep/types.hxx
index ef10ed3..b449551 100644
--- a/bdep/types.hxx
+++ b/bdep/types.hxx
@@ -131,7 +131,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/bdep/utility.cxx b/bdep/utility.cxx
index a04507a..4407eed 100644
--- a/bdep/utility.cxx
+++ b/bdep/utility.cxx
@@ -35,14 +35,14 @@ namespace bdep
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