From 5ef3e2083216ec9008642de51a4ab7ddce107d8f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 13 Dec 2021 12:07:30 +0200
Subject: Add path_traits alias to types.hxx

---
 bdep/ci.cxx      | 2 +-
 bdep/git.cxx     | 2 +-
 bdep/new.cxx     | 2 +-
 bdep/release.cxx | 2 +-
 bdep/sync.cxx    | 4 ++--
 bdep/types.hxx   | 1 +
 bdep/utility.cxx | 4 ++--
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bdep/ci.cxx b/bdep/ci.cxx
index 7971688..4afa7d9 100644
--- a/bdep/ci.cxx
+++ b/bdep/ci.cxx
@@ -101,7 +101,7 @@ namespace bdep
         //
         size_t n (rem->size ());
         if (s.upstream.compare (0, n, *rem) != 0 ||
-            !path::traits_type::is_separator (s.upstream[n]))
+            !path_traits::is_separator (s.upstream[n]))
           fail << "remote '" << *rem << "' is not a prefix for upstream "
                << "branch '" << s.upstream << "'";
 
diff --git a/bdep/git.cxx b/bdep/git.cxx
index 2da7456..ed9d23d 100644
--- a/bdep/git.cxx
+++ b/bdep/git.cxx
@@ -287,7 +287,7 @@ namespace bdep
       {
         // Absolute path or the SSH thing.
         //
-        if (path::traits_type::absolute (s))
+        if (path_traits::absolute (s))
         {
           // This is what we want to end up with:
           //
diff --git a/bdep/new.cxx b/bdep/new.cxx
index e870648..d79f40f 100644
--- a/bdep/new.cxx
+++ b/bdep/new.cxx
@@ -530,7 +530,7 @@ cmd_new (cmd_new_options&& o, cli::group_scanner& args)
     // Reduce name with a directory component to the simple name with
     // --output-dir case.
     //
-    if (path::traits_type::find_separator (a) != string::npos)
+    if (path_traits::find_separator (a) != string::npos)
     {
       try
       {
diff --git a/bdep/release.cxx b/bdep/release.cxx
index 29eb3ab..af2f012 100644
--- a/bdep/release.cxx
+++ b/bdep/release.cxx
@@ -1239,7 +1239,7 @@ namespace bdep
           //
           size_t n (remote.size ());
           if (st.upstream.compare (0, n, remote) != 0 ||
-              !path::traits_type::is_separator (st.upstream[n]))
+              !path_traits::is_separator (st.upstream[n]))
             fail << "remote '" << remote << "' is not a prefix for upstream "
                  << "branch '" << st.upstream << "'";
 
diff --git a/bdep/sync.cxx b/bdep/sync.cxx
index 721985c..f419892 100644
--- a/bdep/sync.cxx
+++ b/bdep/sync.cxx
@@ -1877,8 +1877,8 @@ namespace bdep
 
       // Both paths are normilized so we can just compare them as strings.
       //
-      if (path::traits_type::compare (l.c_str () + b, n,
-                                      s.c_str (),     s.size ()) == 0)
+      if (path_traits::compare (l.c_str () + b, n,
+                                s.c_str (),     s.size ()) == 0)
         return true;
     }
 
diff --git a/bdep/types.hxx b/bdep/types.hxx
index 1fc3d1a..e85b028 100644
--- a/bdep/types.hxx
+++ b/bdep/types.hxx
@@ -89,6 +89,7 @@ namespace bdep
   // <libbutl/path.hxx>
   //
   using butl::path;
+  using path_traits = path::traits_type;
   using butl::dir_path;
   using butl::basic_path;
   using butl::invalid_path;
diff --git a/bdep/utility.cxx b/bdep/utility.cxx
index 8d57b75..01456eb 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_type::temp_name (p));
+    return auto_rmfile (temp_dir / path_traits::temp_name (p));
   }
 
   auto_rmdir
   tmp_dir (const string& p)
   {
     assert (!temp_dir.empty ());
-    return auto_rmdir (temp_dir / dir_path (path::traits_type::temp_name (p)));
+    return auto_rmdir (temp_dir / dir_path (path_traits::temp_name (p)));
   }
 
   void
-- 
cgit v1.1