Avoid overload conflict when USE_STD_STRING is set

We must not end up with two constructors that take the same argument
type.

Author: tautschnig

src/solvers/smt2_incremental/response_or_error.h

@@ -20,11 +20,6 @@ class response_or_errort final
   {
   }
 
-  explicit response_or_errort(std::string message)
-    : messages{std::move(message)}
-  {
-  }
-
   explicit response_or_errort(std::vector<std::string> messages)
     : messages{std::move(messages)}
   {

src/solvers/smt2_incremental/smt_response_validation.cpp

@@ -139,14 +139,14 @@ valid_smt_error_response(const irept &parse_tree)
   // unexpected in the parse tree is now considered to be an invalid response.
   if(parse_tree.get_sub().size() == 1)
   {
-    return {response_or_errort<smt_responset>{
-      "Error response is missing the error message."}};
+    return {response_or_errort<smt_responset>{std::vector<std::string>{
+      {"Error response is missing the error message."}}}};
   }
   if(parse_tree.get_sub().size() > 2)
   {
-    return {response_or_errort<smt_responset>{
-      "Error response has multiple error messages - \"" +
-      print_parse_tree(parse_tree) + "\"."}};
+    return {response_or_errort<smt_responset>{std::vector<std::string>{
+      {"Error response has multiple error messages - \"" +
+       print_parse_tree(parse_tree) + "\"."}}}};
   }
   return validation_propagating<smt_error_responset, smt_responset>(
     validate_string_literal(parse_tree.get_sub()[1]));
@@ -250,10 +250,10 @@ static optionalt<response_or_errort<smt_termt>> try_select_validation(
     return {};
   if(parse_tree.get_sub().size() != 3)
   {
-    return response_or_errort<smt_termt>{
-      "\"select\" is expected to have 2 arguments, but " +
-      std::to_string(parse_tree.get_sub().size()) +
-      " arguments were found - \"" + print_parse_tree(parse_tree) + "\"."};
+    return response_or_errort<smt_termt>{std::vector<std::string>{
+      {"\"select\" is expected to have 2 arguments, but " +
+       std::to_string(parse_tree.get_sub().size()) +
+       " arguments were found - \"" + print_parse_tree(parse_tree) + "\"."}}};
   }
   const auto array = validate_term(parse_tree.get_sub()[1], identifier_table);
   const auto index = validate_term(parse_tree.get_sub()[2], identifier_table);
@@ -281,8 +281,8 @@ static response_or_errort<smt_termt> validate_term(
   {
     return *select_validation;
   }
-  return response_or_errort<smt_termt>{"Unrecognised SMT term - \"" +
-                                       print_parse_tree(parse_tree) + "\"."};
+  return response_or_errort<smt_termt>{std::vector<std::string>{
+    {"Unrecognised SMT term - \"" + print_parse_tree(parse_tree) + "\"."}}};
 }
 
 static response_or_errort<smt_get_value_responset::valuation_pairt>
@@ -305,10 +305,10 @@ validate_valuation_pair(
   if(valid_descriptor.get_sort() != valid_value.get_sort())
   {
     return resultt{
-      "Mismatched descriptor and value sorts in - " +
-      print_parse_tree(pair_parse_tree) + "\nDescriptor has sort " +
-      smt_to_smt2_string(valid_descriptor.get_sort()) + "\nValue has sort " +
-      smt_to_smt2_string(valid_value.get_sort())};
+      {"Mismatched descriptor and value sorts in - " +
+       print_parse_tree(pair_parse_tree) + "\nDescriptor has sort " +
+       smt_to_smt2_string(valid_descriptor.get_sort()) + "\nValue has sort " +
+       smt_to_smt2_string(valid_value.get_sort())}};
   }
   // see https://github.com/diffblue/cbmc/issues/7464 for why we explicitly name
   // the valuation_pairt type here:
@@ -378,6 +378,6 @@ response_or_errort<smt_responset> validate_smt_response(
   {
     return *get_value_response;
   }
-  return response_or_errort<smt_responset>{"Invalid SMT response \"" +
-                                           id2string(parse_tree.id()) + "\""};
+  return response_or_errort<smt_responset>{std::vector<std::string>{
+    {"Invalid SMT response \"" + id2string(parse_tree.id()) + "\""}}};
 }

unit/solvers/smt2_incremental/smt_response_validation.cpp

@@ -22,7 +22,8 @@ TEST_CASE("response_or_errort storage", "[core][smt2_incremental]")
   SECTION("Error response")
   {
     const std::string message{"Test error message"};
-    const response_or_errort<smt_responset> error{message};
+    const response_or_errort<smt_responset> error{
+      std::vector<std::string>{{message}}};
     CHECK_FALSE(error.get_if_valid());
     CHECK(*error.get_if_error() == std::vector<std::string>{message});
   }