From d37709e5c27b1fe7b98de57247449c6272c79580 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 3 Jun 2019 12:59:26 +0300 Subject: Adapt to renaming traits alias to traits_type for basic_path, basic_url, and string_table class templates --- build2/bin/init.cxx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'build2/bin/init.cxx') diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx index 26364b4..31431a3 100644 --- a/build2/bin/init.cxx +++ b/build2/bin/init.cxx @@ -364,7 +364,7 @@ namespace build2 const string& s (cast (l)); if (s.empty () || - (!path::traits::is_separator (s.back ()) && + (!path::traits_type::is_separator (s.back ()) && s.find ('*') == string::npos)) { fail << "missing '*' in binutils pattern '" << s << "'"; @@ -605,7 +605,9 @@ namespace build2 // This can be either a pattern or a fallback search directory. // const string* pat (cast_null (rs["bin.pattern"])); - bool fb (pat != nullptr && path::traits::is_separator (pat->back ())); + + bool fb (pat != nullptr && + path::traits_type::is_separator (pat->back ())); // Don't save the default value to config.build so that if the user // changes, say, the C++ compiler (which hinted the pattern), then @@ -763,7 +765,9 @@ namespace build2 // This can be either a pattern or a fallback search directory. // const string* pat (cast_null (rs["bin.pattern"])); - bool fb (pat != nullptr && path::traits::is_separator (pat->back ())); + + bool fb (pat != nullptr && + path::traits_type::is_separator (pat->back ())); auto p ( config::required ( @@ -874,7 +878,9 @@ namespace build2 // This can be either a pattern or a fallback search directory. // const string* pat (cast_null (rs["bin.pattern"])); - bool fb (pat != nullptr && path::traits::is_separator (pat->back ())); + + bool fb (pat != nullptr && + path::traits_type::is_separator (pat->back ())); auto p ( config::required ( -- cgit v1.1