Use a templated find() to enable lookup without object creation when objects are comparable.

3 files changed, 8 insertions, 7 deletions

diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp
index ce93c761a05..65098662e04 100644
--- a/metrics/src/vespa/metrics/loadmetric.hpp
+++ b/metrics/src/vespa/metrics/loadmetric.hpp
@@ -55,7 +55,7 @@ LoadMetric<MetricType>::LoadMetric(const LoadMetric<MetricType>& other, MetricSe
 }
 
 template<typename MetricType>
-LoadMetric<MetricType>::~LoadMetric() { }
+LoadMetric<MetricType>::~LoadMetric() = default;
 
 template<typename MetricType>
 MetricSet*
@@ -74,10 +74,9 @@ MetricType&
 LoadMetric<MetricType>::getMetric(const LoadType& type) {
     MetricType* metric;
 
-    typename vespalib::hash_map<uint32_t, MetricTypeUP>::iterator it(
-            _metrics.find(type.getId()));
+    auto it = _metrics.find(type.getId());
     if (it == _metrics.end()) {
-        it = _metrics.find(0);
+        it = _metrics.find(0u);
         assert(it != _metrics.end()); // Default should always exist
     }
     metric = it->second.get();
diff --git a/metrics/src/vespa/metrics/memoryconsumption.cpp b/metrics/src/vespa/metrics/memoryconsumption.cpp
index 0e69defa558..5a3280c20ab 100644
--- a/metrics/src/vespa/metrics/memoryconsumption.cpp
+++ b/metrics/src/vespa/metrics/memoryconsumption.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include "memoryconsumption.h"
 #include <vespa/vespalib/stllike/hash_set.h>
+#include <vespa/vespalib/stllike/hashtable.hpp>
 #include <sstream>
 
 namespace metrics {
@@ -16,7 +17,7 @@ MemoryConsumption::MemoryConsumption()
     _seenStrings->resize(1000);
 }
 
-MemoryConsumption::~MemoryConsumption() { }
+MemoryConsumption::~MemoryConsumption() = default;
 
 uint32_t
 MemoryConsumption::getStringMemoryUsage(const std::string& s, uint32_t& uniqueCount) {
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 5b716e2698f..7125446c168 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -13,6 +13,7 @@
 #include <vespa/vespalib/util/stringfmt.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/vespalib/stllike/hashtable.hpp>
 #include <sstream>
 #include <algorithm>
 
@@ -23,8 +24,8 @@ namespace metrics {
 
 typedef MetricsmanagerConfig Config;
 
-MetricManager::ConsumerSpec::ConsumerSpec() : includedMetrics() { }
-MetricManager::ConsumerSpec::~ConsumerSpec() { }
+MetricManager::ConsumerSpec::ConsumerSpec() = default;
+MetricManager::ConsumerSpec::~ConsumerSpec() = default;
 
 void
 MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const {