Complete the split also for tests.

2 files changed, 18 insertions, 14 deletions

diff --git a/metrics/src/vespa/metrics/loadmetric.h b/metrics/src/vespa/metrics/loadmetric.h
index 1ab726a844c..d31ef5efca4 100644
--- a/metrics/src/vespa/metrics/loadmetric.h
+++ b/metrics/src/vespa/metrics/loadmetric.h
@@ -56,20 +56,7 @@ public:
     MetricType& operator[](const LoadType& type) { return getMetric(type); }
     const MetricType& operator[](const LoadType& type) const
         { return const_cast<LoadMetric<MetricType>*>(this)->getMetric(type); }
-    MetricType& getMetric(const LoadType& type) {
-        MetricType* metric;
-
-        typename vespalib::hash_map<uint32_t, MetricTypeLP>::iterator it(
-                _metrics.find(type.getId()));
-        if (it == _metrics.end()) {
-            it = _metrics.find(0);
-            assert(it != _metrics.end()); // Default should always exist
-        }
-        metric = it->second.get();
-        assert(metric);
-
-        return *metric;
-    }
+    MetricType& getMetric(const LoadType& type);
 
     void addMemoryUsage(MemoryConsumption& mc) const override;
 };
diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp
index e1faa756be1..54171341b67 100644
--- a/metrics/src/vespa/metrics/loadmetric.hpp
+++ b/metrics/src/vespa/metrics/loadmetric.hpp
@@ -69,6 +69,23 @@ LoadMetric<MetricType>::clone(std::vector<Metric::LP>& ownerList,
 }
 
 template<typename MetricType>
+MetricType&
+LoadMetric<MetricType>::getMetric(const LoadType& type) {
+    MetricType* metric;
+
+    typename vespalib::hash_map<uint32_t, MetricTypeLP>::iterator it(
+            _metrics.find(type.getId()));
+    if (it == _metrics.end()) {
+        it = _metrics.find(0);
+        assert(it != _metrics.end()); // Default should always exist
+    }
+    metric = it->second.get();
+    assert(metric);
+
+    return *metric;
+}
+
+template<typename MetricType>
 void
 LoadMetric<MetricType>::addMemoryUsage(MemoryConsumption& mc) const {
     ++mc._loadMetricCount;