const void* address)
{
auto pos = std::lower_bound(ignore_list->begin(), ignore_list->end(), address,
- [](auto const& reg, const void* address) { return reg.address < address; });
+ [](auto const& reg, auto const* addr) { return reg.address < addr; });
return (pos != ignore_list->end() && pos->address == address) ? pos->size : -1;
}
return nullptr;
}
-void ObjectInformation::remove_global_variable(const char* name)
+void ObjectInformation::remove_global_variable(const char* var_name)
{
// Binary search:
- auto pos1 = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), name,
- [](auto const& var, const char* var_name) { return var.name.compare(var_name) < 0; });
+ auto pos1 = std::lower_bound(this->global_variables.begin(), this->global_variables.end(), var_name,
+ [](auto const& var, const char* name) { return var.name < name; });
// Find the whole range:
- auto pos2 = std::upper_bound(pos1, this->global_variables.end(), name,
- [](const char* var_name, auto const& var) { return var.name.compare(var_name) > 0; });
+ auto pos2 = std::upper_bound(pos1, this->global_variables.end(), var_name,
+ [](const char* name, auto const& var) { return name < var.name; });
// Remove the whole range:
this->global_variables.erase(pos1, pos2);
}
// Binary search:
auto pos = std::lower_bound(scope.variables.begin(), scope.variables.end(), var_name,
- [](auto const& var, const char* var_name) { return var.name.compare(var_name) < 0; });
- if (pos != scope.variables.end() && pos->name.compare(var_name) == 0) {
+ [](auto const& var, const char* name) { return var.name < name; });
+ if (pos != scope.variables.end() && pos->name == var_name) {
// Variable found, remove it:
scope.variables.erase(pos);
}
{
// Binary search the position of insertion:
auto pos = std::lower_bound(ignored_heap_.begin(), ignored_heap_.end(), region.address,
- [](auto const& reg, const void* address) { return reg.address < address; });
+ [](auto const& reg, auto const* addr) { return reg.address < addr; });
if (pos == ignored_heap_.end() || pos->address != region.address) {
// Insert it:
ignored_heap_.insert(pos, region);
{
// Binary search:
auto pos = std::lower_bound(ignored_heap_.begin(), ignored_heap_.end(), address,
- [](auto const& reg, const void* address) { return reg.address < address; });
+ [](auto const& reg, auto const* addr) { return reg.address < addr; });
if (pos != ignored_heap_.end() && static_cast<char*>(pos->address) <= static_cast<char*>(address) + size)
ignored_heap_.erase(pos);
}