aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/agent/agent.cxx3
-rw-r--r--bbot/agent/machine.cxx2
-rw-r--r--bbot/types.hxx2
-rw-r--r--bbot/worker/worker.cxx2
4 files changed, 5 insertions, 4 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx
index 9e39b0a..06e4adf 100644
--- a/bbot/agent/agent.cxx
+++ b/bbot/agent/agent.cxx
@@ -452,7 +452,8 @@ static inline dir_path
snapshot_path (const dir_path& tp)
{
return tp.directory () /=
- path::traits::temp_name (tp.leaf ().string () + '-' + to_string (inst));
+ path::traits_type::temp_name (tp.leaf ().string () + '-' +
+ to_string (inst));
}
// Return available machines, (re-)bootstrapping them if necessary.
diff --git a/bbot/agent/machine.cxx b/bbot/agent/machine.cxx
index 92ee930..4da58ca 100644
--- a/bbot/agent/machine.cxx
+++ b/bbot/agent/machine.cxx
@@ -244,7 +244,7 @@ namespace bbot
// Machine log. Note that it is only removed with an explicit cleanup()
// call.
//
- log = path ("/tmp/" + path::traits::temp_name (name) + ".log");
+ log = path ("/tmp/" + path::traits_type::temp_name (name) + ".log");
// Map logical CPUs to sockets/cores/threads keeping the number of and
// cores even. Failed that, QEMU just makes it a machine with that number
diff --git a/bbot/types.hxx b/bbot/types.hxx
index 6dc55f5..0318e94 100644
--- a/bbot/types.hxx
+++ b/bbot/types.hxx
@@ -104,7 +104,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/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index 20fa688..00ceecd 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -782,7 +782,7 @@ build (size_t argc, const char* argv[])
if (optional<string> s = getenv ("PATH"))
{
- paths += path::traits::path_separator;
+ paths += path::traits_type::path_separator;
paths += *s;
}