Fix warnings hidden earlier due to including application headers as system includes

2 files changed, 18 insertions, 10 deletions

diff --git a/metrics/src/vespa/metrics/metric.cpp b/metrics/src/vespa/metrics/metric.cpp
index 2259808a8be..4b37624a6f9 100644
--- a/metrics/src/vespa/metrics/metric.cpp
+++ b/metrics/src/vespa/metrics/metric.cpp
@@ -1,6 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "metric.h"
 
+#include "metric.h"
 #include "countmetric.h"
 #include "valuemetric.h"
 #include "metricset.h"
@@ -8,22 +8,18 @@
 #include <vespa/vespalib/text/stringtokenizer.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/stllike/asciistream.h>
-
-#include <algorithm>
 #include <iterator>
 
 namespace metrics {
 
 bool
-MetricVisitor::visitCountMetric(const AbstractCountMetric& m,
-                                bool autoGenerated)
+MetricVisitor::visitCountMetric(const AbstractCountMetric& m, bool autoGenerated)
 {
     return visitMetric(m, autoGenerated);
 }
 
 bool
-MetricVisitor::visitValueMetric(const AbstractValueMetric& m,
-                                bool autoGenerated)
+MetricVisitor::visitValueMetric(const AbstractValueMetric& m, bool autoGenerated)
 {
     return visitMetric(m, autoGenerated);
 }
@@ -52,6 +48,15 @@ namespace {
 
 vespalib::Regexp Metric::_namePattern(namePattern);
 
+Tag::Tag(vespalib::stringref k, vespalib::stringref v)
+    : key(k),
+      value(v)
+{ }
+
+Tag::Tag(const Tag &) = default;
+Tag & Tag::operator = (const Tag &) = default;
+Tag::~Tag() {}
+
 Metric::Metric(const String& name,
                const String& tags,
                const String& description,
diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h
index a494b65127c..8a09c8cba9d 100644
--- a/metrics/src/vespa/metrics/metric.h
+++ b/metrics/src/vespa/metrics/metric.h
@@ -87,9 +87,12 @@ struct Tag
     vespalib::string key;
     vespalib::string value;
 
-    Tag(vespalib::stringref k, vespalib::stringref v)
-        : key(k), value(v)
-    { }
+    Tag(vespalib::stringref k, vespalib::stringref v);
+    Tag(const Tag &);
+    Tag & operator = (const Tag &);
+    Tag(Tag &&) = default;
+    Tag & operator = (Tag &&) = default;
+    ~Tag();
 };
 
 class Metric : public vespalib::Printable