Hide most of the costly metrics in header files stuff

5 files changed, 10 insertions, 9 deletions

diff --git a/metrics/src/tests/loadmetrictest.cpp b/metrics/src/tests/loadmetrictest.cpp
index 3585f4adf32..ff4658d6bb2 100644
--- a/metrics/src/tests/loadmetrictest.cpp
+++ b/metrics/src/tests/loadmetrictest.cpp
@@ -62,7 +62,7 @@ namespace {
         {
         }
 
-        Metric* clone(std::vector<Metric::LP>& ownerList,
+        MetricSet* clone(std::vector<Metric::LP>& ownerList,
                            CopyType copyType,
                            MetricSet* owner,
                            bool includeUnused = false) const
@@ -71,7 +71,9 @@ namespace {
                 return MetricSet::clone(ownerList, copyType, owner,
                                         includeUnused);
             }
-            return (new MyMetricSet(owner))->assignValues(*this);
+            MyMetricSet * myset = new MyMetricSet(owner);
+            myset->assignValues(*this);
+            return myset;
         }
     };
 }
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index d3349d2e91d..31471cc40ed 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -3,7 +3,6 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/log/log.h>
 #include <vespa/metrics/metrics.h>
-#include <vespa/metrics/summetric.hpp>
 #include <vespa/metrics/xmlwriter.h>
 #include <vespa/metrics/jsonwriter.h>
 #include <vespa/metrics/textwriter.h>
diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp
index 626b53f7d90..5683363ab42 100644
--- a/metrics/src/tests/snapshottest.cpp
+++ b/metrics/src/tests/snapshottest.cpp
@@ -67,7 +67,7 @@ struct SubSubMetricSet : public MetricSet {
         averageSum.addMetricToSum(average2);
     }
 
-    virtual Metric* clone(std::vector<Metric::LP>& ownerList,
+    virtual MetricSet* clone(std::vector<Metric::LP>& ownerList,
                           CopyType copyType, metrics::MetricSet* owner,
                           bool includeUnused) const
     {
@@ -119,7 +119,7 @@ struct SubMetricSet : public MetricSet {
         setSum.addMetricToSum(set2);
     }
 
-    virtual Metric* clone(std::vector<Metric::LP>& ownerList,
+    virtual MetricSet* clone(std::vector<Metric::LP>& ownerList,
                           CopyType copyType, metrics::MetricSet* owner,
                           bool includeUnused) const
     {
diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp
index cb069f27300..f164bf03ee1 100644
--- a/metrics/src/tests/stresstest.cpp
+++ b/metrics/src/tests/stresstest.cpp
@@ -43,15 +43,16 @@ namespace {
             _valueSum.addMetricToSum(_value2);
         }
 
-        Metric* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
+        MetricSet* clone(std::vector<Metric::LP>& ownerList, CopyType copyType,
                       MetricSet* owner, bool includeUnused) const
         {
             if (copyType != CLONE) {
                 return MetricSet::clone(ownerList, copyType, owner,
                                         includeUnused);
             }
-            return (new InnerMetricSet(getName().c_str(), _loadTypes, owner))
-                        ->assignValues(*this);
+            InnerMetricSet * myset = new InnerMetricSet(getName().c_str(), _loadTypes, owner);
+            myset->assignValues(*this);
+            return myset;
         }
     };
     struct OuterMetricSet : public MetricSet {
diff --git a/metrics/src/tests/summetrictest.cpp b/metrics/src/tests/summetrictest.cpp
index 3b5812f363f..0343174e0b3 100644
--- a/metrics/src/tests/summetrictest.cpp
+++ b/metrics/src/tests/summetrictest.cpp
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
 #include <vespa/metrics/metrics.h>
-#include <vespa/metrics/summetric.hpp>
 #include <vespa/vdstestlib/cppunit/macros.h>
 
 namespace metrics {