From 5d2f40dbca1ed021eb4586c8f3f5578825e82c57 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 27 Oct 2022 16:14:24 +0200
Subject: Suppress (potential) bogus GCC 12 -Wrestrict warnings

---
 libbbot/build-config.cxx |  4 ++--
 libbbot/manifest.cxx     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libbbot/build-config.cxx b/libbbot/build-config.cxx
index 01ce57e..15061fc 100644
--- a/libbbot/build-config.cxx
+++ b/libbbot/build-config.cxx
@@ -189,9 +189,9 @@ namespace bbot
               r.classes.push_back (c);
           }
           else if (j->second != base && !base.empty ())
-            throw invalid_argument ("'" + c + "' new base '" + base +
+            throw invalid_argument ('\'' + c + "' new base '" + base +
                                     "' does not match existing '" +
-                                    j->second + "'");
+                                    j->second + '\'');
 
           if (!placeholder)
             config.classes.emplace_back (move (c));
diff --git a/libbbot/manifest.cxx b/libbbot/manifest.cxx
index 3f07091..5b9de22 100644
--- a/libbbot/manifest.cxx
+++ b/libbbot/manifest.cxx
@@ -64,7 +64,7 @@ namespace bbot
     else if (s == "error")    return result_status::error;
     else if (s == "abort")    return result_status::abort;
     else if (s == "abnormal") return result_status::abnormal;
-    else throw invalid_argument ("invalid result status '" + s + "'");
+    else throw invalid_argument ("invalid result status '" + s + '\'');
   }
 
   // interactive_mode
@@ -89,7 +89,7 @@ namespace bbot
          if (s == "false") return interactive_mode::false_;
     else if (s == "true")  return interactive_mode::true_;
     else if (s == "both")  return interactive_mode::both;
-    else throw invalid_argument ("invalid interactive mode '" + s + "'");
+    else throw invalid_argument ("invalid interactive mode '" + s + '\'');
   }
 
   // Utility functions
@@ -332,7 +332,7 @@ namespace bbot
         catch (const invalid_argument&)
         {
           bad_value (
-            string ("invalid task request interactive mode '" + v + "'"));
+            string ("invalid task request interactive mode '" + v + '\''));
         }
       }
       else if (n == "interactive-login")
@@ -595,7 +595,7 @@ namespace bbot
         }
         catch (const invalid_argument&)
         {
-          bad_value ("invalid task repository type '" + v + "'");
+          bad_value ("invalid task repository type '" + v + '\'');
         }
       }
       else if (n == "trust")
@@ -685,7 +685,7 @@ namespace bbot
         else if (v == "false")
           host = false;
         else
-          bad_value ("invalid task host value '" + v + "'");
+          bad_value ("invalid task host value '" + v + '\'');
       }
       else if (n == "warning-regex")
       {
-- 
cgit v1.1