summaryrefslogtreecommitdiffstats
path: root/metrics
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-11-29 19:48:02 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2016-12-12 02:55:40 +0100
commitaf4d4c5d3a170aeedf2afbcca42367ec3e53c2fa (patch)
tree69a26931a15318be8ec1f24ac8869158ea97f9c6 /metrics
parent90917525b8d0d3b2ed977d1965790df9b0a125c6 (diff)
include explicit what you need, less is provided by accident.
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp4
-rw-r--r--metrics/src/tests/snapshottest.cpp4
-rw-r--r--metrics/src/tests/stresstest.cpp1
3 files changed, 4 insertions, 5 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 31471cc40ed..87a6a0ea279 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -1141,13 +1141,13 @@ MetricManagerTest::textOutputSupportsDimensions()
}
namespace {
- struct MyUpdateHook : public MetricManager::UpdateHook {
+ struct MyUpdateHook : public UpdateHook {
std::ostringstream& _output;
FakeTimer& _timer;
MyUpdateHook(std::ostringstream& output, const char* name,
FakeTimer& timer)
- : MetricManager::UpdateHook(name), _output(output), _timer(timer) {}
+ : UpdateHook(name), _output(output), _timer(timer) {}
void updateMetrics(const MetricLockGuard & ) override {
_output << _timer.getTime() << ": " << getName() << " called\n";
diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp
index 5683363ab42..253b7b4f2de 100644
--- a/metrics/src/tests/snapshottest.cpp
+++ b/metrics/src/tests/snapshottest.cpp
@@ -4,11 +4,9 @@
#include <vespa/metrics/metrics.h>
#include <vespa/metrics/loadmetric.hpp>
#include <vespa/metrics/summetric.hpp>
+#include <vespa/metrics/metricmanager.h>
#include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/log/log.h>
-LOG_SETUP(".test.snapshot");
-
namespace metrics {
struct SnapshotTest : public CppUnit::TestFixture {
diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp
index d0441e1b3e1..a0e56289d4d 100644
--- a/metrics/src/tests/stresstest.cpp
+++ b/metrics/src/tests/stresstest.cpp
@@ -3,6 +3,7 @@
#include <vespa/metrics/metrics.h>
#include <vespa/metrics/loadmetric.hpp>
#include <vespa/metrics/summetric.hpp>
+#include <vespa/metrics/metricmanager.h>
#include <vespa/vdstestlib/cppunit/macros.h>
#include <vespa/log/log.h>