- auto i = info->types.find(variable.type_id);
- if (i != info->types.end())
- variable.type = &(i->second);
- else
- variable.type = nullptr;
+ variable.type = simgrid::util::find_map_ptr(
+ info->types, variable.type_id);
- auto i = info->types.find(variable.type_id);
- if (i != info->types.end())
- variable.type = &(i->second);
- else
- variable.type = nullptr;
+ variable.type = simgrid::util::find_map_ptr(
+ info->types, variable.type_id);
- auto i = info->types.find(type->type_id);
- if (i != info->types.end())
- type->subtype = &(i->second);
- else {
- type->subtype = nullptr;
+ type->subtype = simgrid::util::find_map_ptr(info->types, type->type_id);
+ if (type->subtype == nullptr)
if (type->subtype->byte_size != 0)
return;
if (type->subtype->name.empty())
return;
// Try to find a more complete description of the type:
// We need to fix in order to support C++.
if (type->subtype->byte_size != 0)
return;
if (type->subtype->name.empty())
return;
// Try to find a more complete description of the type:
// We need to fix in order to support C++.
-
- auto j = info->full_types_by_name.find(type->subtype->name);
- if (j != info->full_types_by_name.end())
- type->subtype = j->second;
+ simgrid::mc::Type** subtype = simgrid::util::find_map_ptr(
+ info->full_types_by_name, type->subtype->name);
+ if (subtype)
+ type->subtype = *subtype;