diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-05 02:32:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 02:03:47 +0200 |
commit | b57308e4a134fb6139d2cb52a031d3e7185f16cf (patch) | |
tree | 7c31d445e2f76bb737ef90ce29e0e7e6738d6eb1 /metrics/src/tests/metricmanagertest.cpp | |
parent | 40b8ba5a3f34028d208d4e0dc1b46940d6fe5a47 (diff) |
Use override
Diffstat (limited to 'metrics/src/tests/metricmanagertest.cpp')
-rw-r--r-- | metrics/src/tests/metricmanagertest.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp index 362cad83a66..0ba6bdfbd2f 100644 --- a/metrics/src/tests/metricmanagertest.cpp +++ b/metrics/src/tests/metricmanagertest.cpp @@ -9,8 +9,6 @@ #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/data/slime/slime.h> -#include <fstream> -#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".test.metricmanager"); @@ -143,22 +141,20 @@ struct MetricNameVisitor : public MetricVisitor { MetricNameVisitor(bool debug_ = false) : debug(debug_) {} - virtual bool visitMetricSet(const MetricSet& metricSet, - bool autoGenerated) override - { + bool visitMetricSet(const MetricSet& metricSet, bool autoGenerated) override { if (debug) { ost << "<" << (autoGenerated ? "*" : "") << metricSet.getPath() << ">\n"; } return true; } - virtual void doneVisitingMetricSet(const MetricSet& metricSet) override { + void doneVisitingMetricSet(const MetricSet& metricSet) override { if (debug) { ost << "</" << metricSet.getPath() << ">\n"; } } - virtual bool visitMetric(const Metric& m, bool autoGenerated) override { + bool visitMetric(const Metric& m, bool autoGenerated) override { ost << (autoGenerated ? "*" : "") << m.getPath() << "\n"; return true; } @@ -390,7 +386,7 @@ namespace { struct FakeTimer : public MetricManager::Timer { time_t _time; FakeTimer(time_t startTime = 0) : _time(startTime) {} - virtual time_t getTime() const override { return _time; } + time_t getTime() const override { return _time; } }; struct BriefValuePrinter : public MetricVisitor { @@ -399,7 +395,7 @@ namespace { BriefValuePrinter() : count(0), ost() {} - virtual bool visitMetric(const Metric& metric, bool) override { + bool visitMetric(const Metric& metric, bool) override { if (++count > 1) ost << ","; //ost << metric.getPath() << ":"; ost << metric.getDoubleValue("value"); |