Merge pull request #23275 from vespa-engine/arnej/idiomatic-cpp

use standard C++ idiom

2 files changed, 6 insertions, 4 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/extract_features.cpp b/searchcore/src/vespa/searchcore/proton/matching/extract_features.cpp
index ca09a3e79f1..6115d642b4a 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/extract_features.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/extract_features.cpp
@@ -32,8 +32,9 @@ auto extract_names(const FeatureResolver &resolver, const StringStringMap &renam
     result.reserve(resolver.num_features());
     for (size_t i = 0; i < resolver.num_features(); ++i) {
         vespalib::string name = resolver.name_of(i);
-        if (renames.contains(name)) {
-            name = renames[name];
+        auto iter = renames.find(name);
+        if (iter != renames.end()) {
+            name = iter->second;
         }
         result.emplace_back(name);
     }
diff --git a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
index bded8af16cc..10e6c6aa68a 100644
--- a/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/hitcollector.cpp
@@ -154,8 +154,9 @@ HitCollector::getFeatureSet(IRankProgram &rankProgram,
     names.reserve(resolver.num_features());
     for (size_t i = 0; i < resolver.num_features(); ++i) {
         vespalib::string name = resolver.name_of(i);
-        if (feature_rename_map.contains(name)) {
-            name = feature_rename_map[name];
+        auto iter = feature_rename_map.find(name);
+        if (iter != feature_rename_map.end()) {
+            name = iter->second;
         }
         names.emplace_back(name);
     }