From bc6050a7b42581f0d4fbbe3f4b38b7ed02239d72 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 27 Oct 2022 15:52:15 +0200
Subject: Suppress bogus GCC 12 -Wrestrict warning

---
 libbutl/b.cxx       | 4 ++--
 libbutl/command.cxx | 8 ++++----
 libbutl/path.cxx    | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libbutl')

diff --git a/libbutl/b.cxx b/libbutl/b.cxx
index 74a430c..ee5c8a5 100644
--- a/libbutl/b.cxx
+++ b/libbutl/b.cxx
@@ -87,7 +87,7 @@ namespace butl
         // Note that quoting is essential here.
         //
         for (const dir_path& p: projects)
-          ps.push_back ("'" + p.representation () + "'");
+          ps.push_back ('\'' + p.representation () + '\'');
 
         pr = process_start_callback (
           cmd_callback ? cmd_callback : [] (const char* const*, size_t) {},
@@ -297,7 +297,7 @@ namespace butl
       assert (!pr.wait ());
 
       throw b_error (
-        string ("process ") + pp.recall_string () + " " + to_string (*pr.exit),
+        string ("process ") + pp.recall_string () + ' ' + to_string (*pr.exit),
         move (pr.exit));
     }
     catch (const process_error& e)
diff --git a/libbutl/command.cxx b/libbutl/command.cxx
index 6f8c0f1..2df52dd 100644
--- a/libbutl/command.cxx
+++ b/libbutl/command.cxx
@@ -51,7 +51,7 @@ namespace butl
       //
       if (p == string::npos)
         throw invalid_argument (string ("unmatched substitution character '") +
-                                open + "'");
+                                open + '\'');
 
       if (p == sp)
         throw invalid_argument ("empty substitution variable");
@@ -60,12 +60,12 @@ namespace butl
 
       if (vn.find_first_of (" \t") != string::npos)
         throw invalid_argument ("whitespace in substitution variable '" +
-                                vn + "'");
+                                vn + '\'');
 
       // Find the variable and append its value or fail if it's unknown.
       //
       if (!sc (vn, r))
-        throw invalid_argument ("unknown substitution variable '" + vn + "'");
+        throw invalid_argument ("unknown substitution variable '" + vn + '\'');
     }
 
     // Append the source string tail following the last substitution.
@@ -168,7 +168,7 @@ namespace butl
         catch (const invalid_path& e)
         {
           throw invalid_argument ("invalid stdout redirect file path '" +
-                                  e.path + "'");
+                                  e.path + '\'');
         }
 
         if (redir->empty ())
diff --git a/libbutl/path.cxx b/libbutl/path.cxx
index e4f373e..bd66f13 100644
--- a/libbutl/path.cxx
+++ b/libbutl/path.cxx
@@ -184,8 +184,8 @@ namespace butl
     using std::to_string;
 
     return prefix
-      + "-" + to_string (process::current_id ())
-      + "-" + to_string (temp_name_count++);
+      + '-' + to_string (process::current_id ())
+      + '-' + to_string (temp_name_count++);
   }
 
   template <>
-- 
cgit v1.1