summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2022-02-15 00:49:29 +0000
committerDan Goodliffe <dan@randomdan.homeip.net>2022-02-15 01:03:50 +0000
commitcf9c4e6632cd145d6c885d3d6cb0e033dad6cf44 (patch)
tree62dd4896c09866e449f79116572d5597d984ac74
parentBump to C++20 for non-legacy CTF (diff)
downloadicetray-cf9c4e6632cd145d6c885d3d6cb0e033dad6cf44.tar.bz2
icetray-cf9c4e6632cd145d6c885d3d6cb0e033dad6cf44.tar.xz
icetray-cf9c4e6632cd145d6c885d3d6cb0e033dad6cf44.zip
Use STL algo
-rw-r--r--icetray/icetray/logger.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/icetray/icetray/logger.cpp b/icetray/icetray/logger.cpp
index 990db6d..5828ce0 100644
--- a/icetray/icetray/logger.cpp
+++ b/icetray/icetray/logger.cpp
@@ -1,6 +1,7 @@
#include "logger.h"
#include "logWriter.h"
#include <Ice/BuiltinSequences.h>
+#include <algorithm>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/constants.hpp>
#include <boost/algorithm/string/detail/classification.hpp>
@@ -216,10 +217,12 @@ namespace IceTray {
IceUtil::Optional<LogLevel>
AbstractLogWriter::level(Domain domain, const Ice::Current &)
{
- for (auto d = logDomains.rbegin(); d != logDomains.rend(); d++) {
- if (boost::algorithm::starts_with(domain, d->first)) {
- return d->second;
- }
+ if (const auto d = std::find_if(logDomains.rbegin(), logDomains.rend(),
+ [&domain](const auto & d) {
+ return boost::algorithm::starts_with(domain, d.first);
+ });
+ d != logDomains.rend()) {
+ return d->second;
}
return IceUtil::None;
}