@@ -52,8 +52,7 @@ std::string unwrap_type_name(const typet &type, const namespacet &ns)
52
52
const std::string result=type2java (type, ns);
53
53
if (!is_primitive_type (type))
54
54
throw std::logic_error (
55
- msgstream () << " ERROR: expecting a primitive data type, "
56
- " but received '" << result << " '." );
55
+ " ERROR: expecting a primitive data type, but received '" + result + " '." );
57
56
return result;
58
57
}
59
58
@@ -224,7 +223,7 @@ void taint_instrumentation_propst::build_map_from_typenames_to_tokennames(
224
223
{
225
224
assert (
226
225
does_instrumentation_of_type_require_subclass (datatype, type)==
227
- it->second .subclass_required () &&
226
+ it->second .subclass_required () &&
228
227
is_primitive_type (type)==it->second .is_primitive ());
229
228
it->second .add_token (arg_token.get_token_name ());
230
229
}
@@ -324,8 +323,8 @@ void taint_build_instrumentation_props(
324
323
std::unordered_set<irep_idt, dstring_hash> ignored_functions (
325
324
suppressed.cbegin (), suppressed.cend ());
326
325
if (!exists_direct_or_indirect_call (
327
- program.get_call_graph (), root, *suppressions.cbegin (),
328
- ignored_functions))
326
+ program.get_call_graph (), root, *suppressions.cbegin (),
327
+ ignored_functions))
329
328
{
330
329
suppressed.insert (as_string (*suppressions.cbegin ()));
331
330
callees.erase (*suppressions.cbegin ());
0 commit comments