From 47b6098418cf35f32bae4d0505423edbbc38a783 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 6 Dec 2024 11:26:14 +0200
Subject: Adapt to renaming of some butl::{ucase,lcase,sanitize_identifier}()
 function overloads

---
 libbuild2/cc/common.cxx | 3 +--
 libbuild2/file.cxx      | 4 ++--
 libbuild2/utility.hxx   | 2 ++
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'libbuild2')

diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index c1e60d2..dfc78e7 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -1567,8 +1567,7 @@ namespace build2
               //
               string d ("-DLIB");
 
-              d += sanitize_identifier (
-                ucase (const_cast<const string&> (t.name)));
+              d += sanitize_identifier (ucase (t.name));
 
               d += '_';
               d += suffix;
diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx
index f755506..fcd3c7c 100644
--- a/libbuild2/file.cxx
+++ b/libbuild2/file.cxx
@@ -2335,7 +2335,7 @@ namespace build2
         //
         const path* p (nullptr);
 
-        string valv (sanitize_identifier (string (tgt.value)));
+        string valv (sanitize_identifier (tgt.value));
 
         if (tgt.typed ())
         {
@@ -2350,7 +2350,7 @@ namespace build2
 
           if (p == nullptr)
           {
-            string ttv (sanitize_identifier (string (tgt.type)));
+            string ttv (sanitize_identifier (tgt.type));
             p = lookup (vp.insert (n + '.' + valv + '.' + ttv), e);
           }
         }
diff --git a/libbuild2/utility.hxx b/libbuild2/utility.hxx
index f4fd7bc..79652ce 100644
--- a/libbuild2/utility.hxx
+++ b/libbuild2/utility.hxx
@@ -73,7 +73,9 @@ namespace build2
   using butl::icase_compare_string;
   using butl::icase_compare_c_string;
   using butl::lcase;
+  using butl::make_lcase;
   using butl::ucase;
+  using butl::make_ucase;
   using butl::alpha;
   using butl::alnum;
   using butl::digit;
-- 
cgit v1.1