From 2a7a93bb9e6f828ea0d4b59b400fbb2e16657c9c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 3 Jun 2019 12:55:14 +0300
Subject: Rename traits alias to traits_type for basic_path, basic_url, and
 string_table class templates

---
 libbutl/url.txx | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'libbutl/url.txx')

diff --git a/libbutl/url.txx b/libbutl/url.txx
index 3f07eb8..10d1fab 100644
--- a/libbutl/url.txx
+++ b/libbutl/url.txx
@@ -335,7 +335,7 @@ LIBBUTL_MODEXPORT namespace butl //@@ MOD Clang needs this for some reason.
             throw invalid_argument ("invalid path");
         }
 
-        path = traits::translate_path (string_type (i, j));
+        path = traits_type::translate_path (string_type (i, j));
         i = j;
       }
 
@@ -372,13 +372,13 @@ LIBBUTL_MODEXPORT namespace butl //@@ MOD Clang needs this for some reason.
 
       // Translate the scheme string representation to its type.
       //
-      optional<scheme_type> s (traits::translate_scheme (u,
-                                                         move (sc),
-                                                         authority,
-                                                         path,
-                                                         query,
-                                                         fragment,
-                                                         rootless));
+      optional<scheme_type> s (traits_type::translate_scheme (u,
+                                                              move (sc),
+                                                              authority,
+                                                              path,
+                                                              query,
+                                                              fragment,
+                                                              rootless));
       assert (s);
       scheme = *s;
     }
@@ -395,13 +395,13 @@ LIBBUTL_MODEXPORT namespace butl //@@ MOD Clang needs this for some reason.
       rootless  = false;
 
       optional<scheme_type> s (
-        traits::translate_scheme (u,
-                                  string_type () /* scheme */,
-                                  authority,
-                                  path,
-                                  query,
-                                  fragment,
-                                  rootless));
+        traits_type::translate_scheme (u,
+                                       string_type () /* scheme */,
+                                       authority,
+                                       path,
+                                       query,
+                                       fragment,
+                                       rootless));
       if (!s)
         throw;
 
@@ -417,13 +417,13 @@ LIBBUTL_MODEXPORT namespace butl //@@ MOD Clang needs this for some reason.
       return string_type ();
 
     string_type u;
-    string_type r (traits::translate_scheme (u,
-                                             scheme,
-                                             authority,
-                                             path,
-                                             query,
-                                             fragment,
-                                             rootless));
+    string_type r (traits_type::translate_scheme (u,
+                                                  scheme,
+                                                  authority,
+                                                  path,
+                                                  query,
+                                                  fragment,
+                                                  rootless));
 
     // Return the custom URL pbject representation if provided.
     //
@@ -451,7 +451,7 @@ LIBBUTL_MODEXPORT namespace butl //@@ MOD Clang needs this for some reason.
       if (!rootless)
         r += '/';
 
-      r += traits::translate_path (*path);
+      r += traits_type::translate_path (*path);
     }
 
     if (query)
-- 
cgit v1.1