From 20879d4a93d82cc9dda996700cd2c0cc94f002af Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 3 Jun 2019 17:41:06 +0300 Subject: Fix missing for Windows traits alias renaming --- libbutl/filesystem.cxx | 4 ++-- libbutl/process.cxx | 4 ++-- tests/process/driver.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libbutl/filesystem.cxx b/libbutl/filesystem.cxx index dad256e..df738ac 100644 --- a/libbutl/filesystem.cxx +++ b/libbutl/filesystem.cxx @@ -200,10 +200,10 @@ namespace butl // case. // string d; - if (path::traits::root (p)) + if (path::traits_type::root (p)) { d = p; - d += path::traits::directory_separator; + d += path::traits_type::directory_separator; p = d.c_str (); } diff --git a/libbutl/process.cxx b/libbutl/process.cxx index d7cabf1..8e401ff 100644 --- a/libbutl/process.cxx +++ b/libbutl/process.cxx @@ -934,7 +934,7 @@ namespace butl { // Note that there is a similar version for Win32. - typedef path::traits traits; + typedef path::traits_type traits; size_t fn (strlen (f)); @@ -1420,7 +1420,7 @@ namespace butl optional batch; { const char* p (pp.effect_string ()); - const char* e (path::traits::find_extension (p)); + const char* e (path::traits_type::find_extension (p)); if (e != nullptr && (casecmp (e, ".bat") == 0 || casecmp (e, ".cmd") == 0)) { diff --git a/tests/process/driver.cxx b/tests/process/driver.cxx index ee946ca..f2dd337 100644 --- a/tests/process/driver.cxx +++ b/tests/process/driver.cxx @@ -411,7 +411,7 @@ main (int argc, const char* argv[]) assert (exec (owd / "test.bat")); assert (exec (owd / "test")); - paths = owd.string () + path::traits::path_separator + paths; + paths = owd.string () + path::traits_type::path_separator + paths; setenv ("PATH", paths); assert (exec (path ("test.bat"))); -- cgit v1.1