diff --git a/jbmc/src/java_bytecode/character_refine_preprocess.h b/jbmc/src/java_bytecode/character_refine_preprocess.h index a9ae6e4e8ce..5f5f91b7f9f 100644 --- a/jbmc/src/java_bytecode/character_refine_preprocess.h +++ b/jbmc/src/java_bytecode/character_refine_preprocess.h @@ -23,6 +23,7 @@ Date: March 2017 #include #include +#include #include class code_function_callt; diff --git a/jbmc/src/java_bytecode/java_bytecode_parse_tree.h b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h index 0af9819055c..cd1544ef3c1 100644 --- a/jbmc/src/java_bytecode/java_bytecode_parse_tree.h +++ b/jbmc/src/java_bytecode/java_bytecode_parse_tree.h @@ -10,14 +10,15 @@ Author: Daniel Kroening, kroening@kroening.com #ifndef CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H #define CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSE_TREE_H -#include -#include - #include #include "bytecode_info.h" #include "java_types.h" +#include +#include +#include + struct java_bytecode_parse_treet { // Disallow copy construction and copy assignment, but allow move construction diff --git a/jbmc/src/java_bytecode/java_class_loader_base.h b/jbmc/src/java_bytecode/java_class_loader_base.h index 5ae4874a6bc..7507b35a6cc 100644 --- a/jbmc/src/java_bytecode/java_class_loader_base.h +++ b/jbmc/src/java_bytecode/java_class_loader_base.h @@ -13,6 +13,8 @@ Author: Daniel Kroening, kroening@kroening.com #include "jar_pool.h" +#include + class message_handlert; struct java_bytecode_parse_treet; diff --git a/src/crangler/c_wrangler.cpp b/src/crangler/c_wrangler.cpp index 2bb5f6b75a2..42d1c764169 100644 --- a/src/crangler/c_wrangler.cpp +++ b/src/crangler/c_wrangler.cpp @@ -23,6 +23,7 @@ Author: Daniel Kroening, dkr@amazon.com #include // IWYU pragma: keep #include +#include #include #include #include diff --git a/src/goto-cc/compile.h b/src/goto-cc/compile.h index 3eb20174f0e..1e933d01606 100644 --- a/src/goto-cc/compile.h +++ b/src/goto-cc/compile.h @@ -18,6 +18,7 @@ Date: June 2006 #include #include +#include #include class cmdlinet; diff --git a/src/goto-cc/ld_mode.h b/src/goto-cc/ld_mode.h index 7d60e92ade2..c9704d776ee 100644 --- a/src/goto-cc/ld_mode.h +++ b/src/goto-cc/ld_mode.h @@ -17,6 +17,8 @@ Date: June 2006 #include "gcc_message_handler.h" #include "goto_cc_mode.h" +#include + class ld_modet : public goto_cc_modet { public: diff --git a/src/goto-cc/linker_script_merge.h b/src/goto-cc/linker_script_merge.h index 338d51c13d6..37b91d37a65 100644 --- a/src/goto-cc/linker_script_merge.h +++ b/src/goto-cc/linker_script_merge.h @@ -5,11 +5,12 @@ #ifndef CPROVER_GOTO_CC_LINKER_SCRIPT_MERGE_H #define CPROVER_GOTO_CC_LINKER_SCRIPT_MERGE_H +#include + #include +#include #include -#include - class cmdlinet; class exprt; // IWYU pragma: keep class goto_modelt; diff --git a/src/goto-harness/recursive_initialization.h b/src/goto-harness/recursive_initialization.h index 04a30a19700..8f0e9145c9b 100644 --- a/src/goto-harness/recursive_initialization.h +++ b/src/goto-harness/recursive_initialization.h @@ -9,15 +9,16 @@ Author: Diffblue Ltd. #ifndef CPROVER_GOTO_HARNESS_RECURSIVE_INITIALIZATION_H #define CPROVER_GOTO_HARNESS_RECURSIVE_INITIALIZATION_H -#include -#include -#include - #include #include #include #include +#include +#include +#include +#include + class code_blockt; class goto_modelt; diff --git a/src/goto-programs/goto_program.h b/src/goto-programs/goto_program.h index 5cbe7fc9ac2..fa8eca15353 100644 --- a/src/goto-programs/goto_program.h +++ b/src/goto-programs/goto_program.h @@ -12,16 +12,17 @@ Author: Daniel Kroening, kroening@kroening.com #ifndef CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H #define CPROVER_GOTO_PROGRAMS_GOTO_PROGRAM_H +#include +#include + #include "goto_instruction_code.h" #include -#include #include +#include +#include #include -#include -#include - class code_gotot; class namespacet; enum class validation_modet; diff --git a/src/goto-programs/graphml_witness.cpp b/src/goto-programs/graphml_witness.cpp index a1023e8e531..d15753b8fa1 100644 --- a/src/goto-programs/graphml_witness.cpp +++ b/src/goto-programs/graphml_witness.cpp @@ -20,6 +20,9 @@ Author: Daniel Kroening #include #include #include +#ifndef USE_DSTRING +# include +#endif #include #include diff --git a/src/goto-symex/symex_main.cpp b/src/goto-symex/symex_main.cpp index ab929728998..8c1ec308bda 100644 --- a/src/goto-symex/symex_main.cpp +++ b/src/goto-symex/symex_main.cpp @@ -9,24 +9,24 @@ Author: Daniel Kroening, kroening@kroening.com /// \file /// Symbolic Execution -#include "goto_symex.h" - -#include - -#include - #include #include #include #include #include #include +#include #include #include #include +#include + +#include "goto_symex.h" #include "path_storage.h" +#include + symex_configt::symex_configt(const optionst &options) : max_depth(options.get_unsigned_int_option("depth")), doing_path_exploration(options.is_set("paths")), diff --git a/src/goto-synthesizer/expr_enumerator.h b/src/goto-synthesizer/expr_enumerator.h index 138e584b163..057be543d6d 100644 --- a/src/goto-synthesizer/expr_enumerator.h +++ b/src/goto-synthesizer/expr_enumerator.h @@ -11,6 +11,7 @@ Author: Qinheping Hu #include +#include #include #include diff --git a/src/libcprover-cpp/verification_result.cpp b/src/libcprover-cpp/verification_result.cpp index fd18f7ef4a2..a080b907cd6 100644 --- a/src/libcprover-cpp/verification_result.cpp +++ b/src/libcprover-cpp/verification_result.cpp @@ -114,7 +114,7 @@ std::vector verification_resultt::get_property_ids() const std::vector result; for(const auto &props : _impl->get_properties()) { - result.push_back(as_string(props.first)); + result.push_back(id2string(props.first)); } return result; } diff --git a/src/solvers/flattening/bv_utils.cpp b/src/solvers/flattening/bv_utils.cpp index 4204a07ce6a..96cd9cf2b57 100644 --- a/src/solvers/flattening/bv_utils.cpp +++ b/src/solvers/flattening/bv_utils.cpp @@ -8,6 +8,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "bv_utils.h" +#include #include bvt bv_utilst::build_constant(const mp_integer &n, std::size_t width) diff --git a/src/solvers/smt2_incremental/response_or_error.h b/src/solvers/smt2_incremental/response_or_error.h index 7c9c4236ace..f2995aeff44 100644 --- a/src/solvers/smt2_incremental/response_or_error.h +++ b/src/solvers/smt2_incremental/response_or_error.h @@ -20,11 +20,6 @@ class response_or_errort final { } - explicit response_or_errort(std::string message) - : smt_or_messages{std::vector{std::move(message)}} - { - } - explicit response_or_errort(std::vector messages) : smt_or_messages{std::move(messages)} { diff --git a/src/solvers/smt2_incremental/smt_response_validation.cpp b/src/solvers/smt2_incremental/smt_response_validation.cpp index 1f8bdb754ad..8a91ca14a4b 100644 --- a/src/solvers/smt2_incremental/smt_response_validation.cpp +++ b/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{ - "Error response is missing the error message."}}; + return {response_or_errort{std::vector{ + {"Error response is missing the error message."}}}}; } if(parse_tree.get_sub().size() > 2) { - return {response_or_errort{ - "Error response has multiple error messages - \"" + - print_parse_tree(parse_tree) + "\"."}}; + return {response_or_errort{std::vector{ + {"Error response has multiple error messages - \"" + + print_parse_tree(parse_tree) + "\"."}}}}; } return validation_propagating( validate_string_literal(parse_tree.get_sub()[1])); @@ -250,10 +250,10 @@ static std::optional> try_select_validation( return {}; if(parse_tree.get_sub().size() != 3) { - return response_or_errort{ - "\"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{std::vector{ + {"\"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 validate_term( { return *select_validation; } - return response_or_errort{"Unrecognised SMT term - \"" + - print_parse_tree(parse_tree) + "\"."}; + return response_or_errort{std::vector{ + {"Unrecognised SMT term - \"" + print_parse_tree(parse_tree) + "\"."}}}; } static response_or_errort @@ -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 validate_smt_response( { return *get_value_response; } - return response_or_errort{"Invalid SMT response \"" + - id2string(parse_tree.id()) + "\""}; + return response_or_errort{std::vector{ + {"Invalid SMT response \"" + id2string(parse_tree.id()) + "\""}}}; } diff --git a/src/solvers/strings/string_constraint_instantiation.cpp b/src/solvers/strings/string_constraint_instantiation.cpp index 6fa966a6ac9..4769d4f8f19 100644 --- a/src/solvers/strings/string_constraint_instantiation.cpp +++ b/src/solvers/strings/string_constraint_instantiation.cpp @@ -10,8 +10,6 @@ Author: Jesse Sigal, jesse.sigal@diffblue.com /// Defines related function for string constraints. #include "string_constraint_instantiation.h" -#include -#include #include #include @@ -19,6 +17,10 @@ Author: Jesse Sigal, jesse.sigal@diffblue.com #include "string_constraint.h" +#include +#include +#include + /// Look for symbol \p qvar in the expression \p index and return true if found /// \return True, iff \p qvar appears in \p index. static bool contains(const exprt &index, const symbol_exprt &qvar) diff --git a/src/statement-list/statement_list_parse_tree.h b/src/statement-list/statement_list_parse_tree.h index 4f5e8efcd1f..e7fa7aa50e0 100644 --- a/src/statement-list/statement_list_parse_tree.h +++ b/src/statement-list/statement_list_parse_tree.h @@ -15,6 +15,8 @@ Author: Matthias Weiss, matthias.weiss@diffblue.com #include #include +#include + /// Intermediate representation of a parsed Statement List file before /// converting it into a goto program. Contains all data structures that are /// necessary for describing Statement List functions and function blocks. diff --git a/src/util/irep_ids.cpp b/src/util/irep_ids.cpp index 5a6bc4e525d..bb933862ed7 100644 --- a/src/util/irep_ids.cpp +++ b/src/util/irep_ids.cpp @@ -45,7 +45,7 @@ enum class idt:unsigned #else #define IREP_ID_ONE(the_id) const std::string ID_##the_id(#the_id); -#define IREP_ID_TWO(the_id, str) const std::string ID_##the_id(#the_id); +# define IREP_ID_TWO(the_id, str) const std::string ID_##the_id(# str); #endif diff --git a/src/util/irep_serialization.cpp b/src/util/irep_serialization.cpp index b9a6d68345d..e959e8d99f1 100644 --- a/src/util/irep_serialization.cpp +++ b/src/util/irep_serialization.cpp @@ -13,11 +13,12 @@ Date: May 2007 #include "irep_serialization.h" +#include "exception_utils.h" +#include "string_container.h" + #include #include -#include "exception_utils.h" - void irep_serializationt::write_irep( std::ostream &out, const irept &irep) @@ -211,7 +212,11 @@ void irep_serializationt::write_string_ref( std::ostream &out, const irep_idt &s) { - size_t id=irep_id_hash()(s); +#ifdef USE_DSTRING + size_t id = s.get_no(); +#else + size_t id = get_string_container()[s]; +#endif if(id>=ireps_container.string_map.size()) ireps_container.string_map.resize(id+1, false); diff --git a/src/util/json.h b/src/util/json.h index a63c746fa2a..dbb0b706f68 100644 --- a/src/util/json.h +++ b/src/util/json.h @@ -274,7 +274,7 @@ class json_stringt:public jsont { } -#ifndef USE_STD_STRING +#ifdef USE_DSTRING explicit json_stringt(const irep_idt &_value) : jsont(kindt::J_STRING, id2string(_value)) { diff --git a/src/util/symbol_table_base.h b/src/util/symbol_table_base.h index e91ed118a05..976d108f4b7 100644 --- a/src/util/symbol_table_base.h +++ b/src/util/symbol_table_base.h @@ -8,6 +8,7 @@ #include "symbol.h" // IWYU pragma: keep +#include #include #include diff --git a/unit/analyses/variable-sensitivity/abstract_environment/to_predicate.cpp b/unit/analyses/variable-sensitivity/abstract_environment/to_predicate.cpp index 10cd6ef6052..c53ac49c2ac 100644 --- a/unit/analyses/variable-sensitivity/abstract_environment/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/abstract_environment/to_predicate.cpp @@ -52,7 +52,7 @@ SCENARIO( auto type = signedbv_typet(32); auto val2 = make_constant(from_integer(2, type), env, ns); - auto x_name = symbol_exprt(dstringt("x"), type); + auto x_name = symbol_exprt("x", type); env.assign(x_name, val2, ns); @@ -65,10 +65,10 @@ SCENARIO( auto type = signedbv_typet(32); auto val2 = make_constant(from_integer(2, type), env, ns); - auto x_name = symbol_exprt(dstringt("x"), type); + auto x_name = symbol_exprt("x", type); auto val3 = make_constant(from_integer(3, type), env, ns); - auto y_name = symbol_exprt(dstringt("y"), type); + auto y_name = symbol_exprt("y", type); env.assign(x_name, val2, ns); env.assign(y_name, val3, ns); diff --git a/unit/analyses/variable-sensitivity/constant_abstract_value/to_predicate.cpp b/unit/analyses/variable-sensitivity/constant_abstract_value/to_predicate.cpp index 3f373ae591c..a5358355321 100644 --- a/unit/analyses/variable-sensitivity/constant_abstract_value/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/constant_abstract_value/to_predicate.cpp @@ -25,7 +25,7 @@ SCENARIO( const typet type = signedbv_typet(32); const exprt val2 = from_integer(2, type); - const exprt x_name = symbol_exprt(dstringt("x"), type); + const exprt x_name = symbol_exprt("x", type); auto config = vsd_configt::constant_domain(); config.context_tracking.data_dependency_context = false; diff --git a/unit/analyses/variable-sensitivity/constant_pointer_abstract_object/to_predicate.cpp b/unit/analyses/variable-sensitivity/constant_pointer_abstract_object/to_predicate.cpp index d3b1e6e38a9..ce37c9ca7cc 100644 --- a/unit/analyses/variable-sensitivity/constant_pointer_abstract_object/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/constant_pointer_abstract_object/to_predicate.cpp @@ -24,9 +24,9 @@ SCENARIO( { const auto int_type = signedbv_typet(32); const auto ptr_type = pointer_typet(int_type, 32); - const auto val2_symbol = symbol_exprt(dstringt("val2"), int_type); + const auto val2_symbol = symbol_exprt("val2", int_type); - const auto x_name = symbol_exprt(dstringt("x"), int_type); + const auto x_name = symbol_exprt("x", int_type); auto config = vsd_configt::constant_domain(); config.context_tracking.data_dependency_context = false; diff --git a/unit/analyses/variable-sensitivity/interval_abstract_value/to_predicate.cpp b/unit/analyses/variable-sensitivity/interval_abstract_value/to_predicate.cpp index d5c673e391b..91941c97dd7 100644 --- a/unit/analyses/variable-sensitivity/interval_abstract_value/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/interval_abstract_value/to_predicate.cpp @@ -35,7 +35,7 @@ SCENARIO( const exprt val1 = from_integer(1, type); const exprt val2 = from_integer(2, type); - const exprt x_name = symbol_exprt(dstringt("x"), type); + const exprt x_name = symbol_exprt("x", type); auto config = vsd_configt::constant_domain(); config.context_tracking.data_dependency_context = false; diff --git a/unit/analyses/variable-sensitivity/value_expression_evaluation/assume.cpp b/unit/analyses/variable-sensitivity/value_expression_evaluation/assume.cpp index a852d3ddc27..dc21adae69e 100644 --- a/unit/analyses/variable-sensitivity/value_expression_evaluation/assume.cpp +++ b/unit/analyses/variable-sensitivity/value_expression_evaluation/assume.cpp @@ -24,7 +24,7 @@ #include exprt binary_expression( - dstringt const &exprId, + const irep_idt &exprId, const abstract_object_pointert &op1, const abstract_object_pointert &op2, abstract_environmentt &environment, @@ -83,7 +83,7 @@ class assume_testert } void test_fn( - dstringt const &exprId, + const irep_idt &exprId, bool is_true, std::string const &test, std::string const &delimiter) diff --git a/unit/analyses/variable-sensitivity/value_set_abstract_object/to_predicate.cpp b/unit/analyses/variable-sensitivity/value_set_abstract_object/to_predicate.cpp index fb720e98f15..e37287e2b30 100644 --- a/unit/analyses/variable-sensitivity/value_set_abstract_object/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/value_set_abstract_object/to_predicate.cpp @@ -37,7 +37,7 @@ SCENARIO( const exprt interval_0_2 = constant_interval_exprt(val1, val2); const exprt interval_2_3 = constant_interval_exprt(val2, val3); - const exprt x_name = symbol_exprt(dstringt("x"), type); + const exprt x_name = symbol_exprt("x", type); auto config = vsd_configt::constant_domain(); config.context_tracking.data_dependency_context = false; diff --git a/unit/analyses/variable-sensitivity/value_set_pointer_abstract_object/to_predicate.cpp b/unit/analyses/variable-sensitivity/value_set_pointer_abstract_object/to_predicate.cpp index 85a48f8c2d3..ed8cf002a4d 100644 --- a/unit/analyses/variable-sensitivity/value_set_pointer_abstract_object/to_predicate.cpp +++ b/unit/analyses/variable-sensitivity/value_set_pointer_abstract_object/to_predicate.cpp @@ -32,10 +32,10 @@ SCENARIO( { const auto int_type = signedbv_typet(32); const auto ptr_type = pointer_typet(int_type, 32); - const auto val1_symbol = symbol_exprt(dstringt("val1"), int_type); - const auto val2_symbol = symbol_exprt(dstringt("val2"), int_type); + const auto val1_symbol = symbol_exprt("val1", int_type); + const auto val2_symbol = symbol_exprt("val2", int_type); - const auto x_name = symbol_exprt(dstringt("x"), int_type); + const auto x_name = symbol_exprt("x", int_type); auto config = vsd_configt::constant_domain(); config.context_tracking.data_dependency_context = false; diff --git a/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp b/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp index 2dcf739d89c..b7d2fd4b796 100644 --- a/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp +++ b/unit/analyses/variable-sensitivity/variable_sensitivity_test_helpers.cpp @@ -590,7 +590,7 @@ std::shared_ptr add_as_value_set( void THEN_PREDICATE(const abstract_object_pointert &obj, const std::string &out) { - const auto x_name = symbol_exprt(dstringt("x"), obj->type()); + const auto x_name = symbol_exprt("x", obj->type()); auto pred = obj->to_predicate(x_name); THEN("predicate is " + out) { diff --git a/unit/compound_block_locations.h b/unit/compound_block_locations.h index ff6f2e2aca7..d9ce0eb50de 100644 --- a/unit/compound_block_locations.h +++ b/unit/compound_block_locations.h @@ -7,6 +7,7 @@ #include +#include #include class exprt; diff --git a/unit/goto-symex/apply_condition.cpp b/unit/goto-symex/apply_condition.cpp index e666c4ff2c9..9c22a88a024 100644 --- a/unit/goto-symex/apply_condition.cpp +++ b/unit/goto-symex/apply_condition.cpp @@ -6,12 +6,12 @@ Author: Owen Mansel-Chan, owen.mansel-chan@diffblue.com \*******************************************************************/ -#include - +#include #include #include #include +#include static void add_to_symbol_table( symbol_tablet &symbol_table, diff --git a/unit/goto-symex/goto_symex_state.cpp b/unit/goto-symex/goto_symex_state.cpp index 438e13c0eb2..8e5d02395e6 100644 --- a/unit/goto-symex/goto_symex_state.cpp +++ b/unit/goto-symex/goto_symex_state.cpp @@ -6,15 +6,16 @@ Author: Diffblue Ltd. \*******************************************************************/ -#include - -#include -#include #include #include +#include #include #include +#include +#include +#include + static void add_to_symbol_table( symbol_tablet &symbol_table, const symbol_exprt &symbol_expr) diff --git a/unit/goto-symex/symex_assign.cpp b/unit/goto-symex/symex_assign.cpp index 11ce8dddeb0..ae0ff8984d7 100644 --- a/unit/goto-symex/symex_assign.cpp +++ b/unit/goto-symex/symex_assign.cpp @@ -8,6 +8,7 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com #include #include +#include #include #include #include diff --git a/unit/goto-symex/try_evaluate_pointer_comparisons.cpp b/unit/goto-symex/try_evaluate_pointer_comparisons.cpp index 4ca9cb1a572..1581e99e9de 100644 --- a/unit/goto-symex/try_evaluate_pointer_comparisons.cpp +++ b/unit/goto-symex/try_evaluate_pointer_comparisons.cpp @@ -6,11 +6,11 @@ Author: Romain Brenguier, romain.brenguier@diffblue.com \*******************************************************************/ -#include +#include +#include #include - -#include +#include static void add_to_symbol_table( symbol_tablet &symbol_table, diff --git a/unit/solvers/smt2_incremental/smt_response_validation.cpp b/unit/solvers/smt2_incremental/smt_response_validation.cpp index ec1aa27c791..d5a15ce02c5 100644 --- a/unit/solvers/smt2_incremental/smt_response_validation.cpp +++ b/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 error{message}; + const response_or_errort error{ + std::vector{{message}}}; CHECK_FALSE(error.get_if_valid()); CHECK(*error.get_if_error() == std::vector{message}); } diff --git a/unit/util/irep.cpp b/unit/util/irep.cpp index a345068bbd0..da50c0b85ad 100644 --- a/unit/util/irep.cpp +++ b/unit/util/irep.cpp @@ -22,7 +22,7 @@ SCENARIO("irept_memory", "[core][utils][irept]") const std::size_t ref_count_size = 0; #endif -#ifndef USE_STD_STRING +#ifdef USE_DSTRING const std::size_t data_size = sizeof(dstringt); REQUIRE(sizeof(dstringt) == sizeof(unsigned)); #else