Split in hash_xxx, array, lru, cache ++ in hpp files. To reduce clinon build

6 files changed, 14 insertions, 7 deletions

diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp
index 7e0518d9403..e1faa756be1 100644
--- a/metrics/src/vespa/metrics/loadmetric.hpp
+++ b/metrics/src/vespa/metrics/loadmetric.hpp
@@ -3,6 +3,7 @@
 
 #include "loadmetric.h"
 #include "memoryconsumption.h"
+#include <vespa/vespalib/stllike/hash_map.hpp>
 
 namespace metrics {
 
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp
index 4c5fb22f717..13d7443d2bb 100644
--- a/metrics/src/vespa/metrics/metricmanager.cpp
+++ b/metrics/src/vespa/metrics/metricmanager.cpp
@@ -13,7 +13,6 @@
 
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-
 #include <vespa/log/log.h>
 
 LOG_SETUP(".metrics.manager");
@@ -22,6 +21,9 @@ namespace metrics {
 
 typedef MetricsmanagerConfig Config;
 
+MetricManager::ConsumerSpec::ConsumerSpec() : includedMetrics() { }
+MetricManager::ConsumerSpec::~ConsumerSpec() { }
+
 void
 MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const {
     if (!g.monitors(_waiter)) {
@@ -355,8 +357,7 @@ MetricManager::handleMetricsAltered(const MetricLockGuard & guard)
     for (const auto & consumer : _config->consumer) {
         ConsumerMetricBuilder consumerMetricBuilder(consumer);
         _activeMetrics.getMetrics().visit(consumerMetricBuilder);
-        configMap[consumer.name] = ConsumerSpec::SP(
-                new ConsumerSpec(consumerMetricBuilder._matchedMetrics));
+        configMap[consumer.name] = ConsumerSpec::SP(new ConsumerSpec(std::move(consumerMetricBuilder._matchedMetrics)));
     }
     LOG(debug, "Recreating snapshots to include altered metrics");
     _activeMetrics.updateNames(_nameHash);
diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h
index ad2a807f8f4..138a4b0c06f 100644
--- a/metrics/src/vespa/metrics/metricmanager.h
+++ b/metrics/src/vespa/metrics/metricmanager.h
@@ -58,6 +58,8 @@
 #include <vespa/vespalib/util/jsonwriter.h>
 #include <vespa/config/config.h>
 
+template class vespalib::hash_set<metrics::Metric::String>;
+
 namespace metrics {
 
 typedef vespalib::MonitorGuard MetricLockGuard;
@@ -80,7 +82,10 @@ public:
         typedef std::shared_ptr<ConsumerSpec> SP;
 
         vespalib::hash_set<Metric::String> includedMetrics;
-        ConsumerSpec() : includedMetrics() {}
+        ConsumerSpec(ConsumerSpec &&) = default;
+        ConsumerSpec & operator= (ConsumerSpec &&) = default;
+        ConsumerSpec();
+        ~ConsumerSpec();
 
         bool contains(const Metric& m) const {
             return (includedMetrics.find(m.getPath()) != includedMetrics.end());
diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp
index da589b7b6e0..397eaa85538 100644
--- a/metrics/src/vespa/metrics/metricset.cpp
+++ b/metrics/src/vespa/metrics/metricset.cpp
@@ -2,7 +2,7 @@
 
 #include "metricset.h"
 #include "memoryconsumption.h"
-#include <vespa/vespalib/stllike/hash_map.h>
+#include <vespa/vespalib/stllike/hash_map.hpp>
 #include <vespa/vespalib/util/exceptions.h>
 #include <list>
 
diff --git a/metrics/src/vespa/metrics/namehash.cpp b/metrics/src/vespa/metrics/namehash.cpp
index 29a6f55257b..d957656a731 100644
--- a/metrics/src/vespa/metrics/namehash.cpp
+++ b/metrics/src/vespa/metrics/namehash.cpp
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "namehash.h"
-#include <vespa/metrics/memoryconsumption.h>
+#include "memoryconsumption.h"
 #include <vespa/vespalib/stllike/hash_set.h>
 
 namespace metrics {
diff --git a/metrics/src/vespa/metrics/namehash.h b/metrics/src/vespa/metrics/namehash.h
index a6e73ac47d6..ee1bc3e52a8 100644
--- a/metrics/src/vespa/metrics/namehash.h
+++ b/metrics/src/vespa/metrics/namehash.h
@@ -20,7 +20,7 @@
  */
 #pragma once
 
-#include <vespa/metrics/memoryconsumption.h>
+#include "memoryconsumption.h"
 
 namespace metrics {