From 0c769b04b72a1805e1ffa32b4fca5f59fc98431a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Wed, 14 Oct 2020 22:06:08 +0200 Subject: cleanup: replace std::find_if by std::any_of To search for devices with the same model, we used find_if(). However, that was only to check whether such a thing exists, not to actually do something with said device. Therefore, change this to std::any_of() to make it clear what the purpose of the statement is. Signed-off-by: Berthold Stoeger --- core/device.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'core') diff --git a/core/device.cpp b/core/device.cpp index 4b2395509..4bfdd3ea4 100644 --- a/core/device.cpp +++ b/core/device.cpp @@ -314,10 +314,9 @@ extern "C" void set_dc_nickname(struct dive *dive, struct device_table *device_t if (!empty_string(dc->model) && dc->deviceid && !get_device_for_dc(device_table, dc)) { // we don't have this one, yet - auto it = std::find_if(device_table->devices.begin(), device_table->devices.end(), - [dc] (const device &dev) - { return !strcasecmp(dev.model.c_str(), dc->model); }); - if (it != device_table->devices.end()) { + if (std::any_of(device_table->devices.begin(), device_table->devices.end(), + [dc] (const device &dev) + { return !strcasecmp(dev.model.c_str(), dc->model); })) { // we already have this model but a different deviceid std::string simpleNick(dc->model); if (dc->deviceid == 0) -- cgit v1.2.3-70-g09d2