summaryrefslogtreecommitdiffstats
path: root/metrics
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:18 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-04-10 15:57:18 +0200
commita55e5a9fe0d87ed267eb8f6ddbddf66568b81d41 (patch)
tree7038fe4886e87474502aa4d64c7b84ebc1b17a48 /metrics
parent46f125fd81c946ff8ac706dec225b69c5362e18d (diff)
add override in metrics module
Diffstat (limited to 'metrics')
-rw-r--r--metrics/src/tests/metricmanagertest.cpp10
-rw-r--r--metrics/src/tests/metricsettest.cpp4
-rw-r--r--metrics/src/tests/snapshottest.cpp4
-rw-r--r--metrics/src/tests/stresstest.cpp2
4 files changed, 10 insertions, 10 deletions
diff --git a/metrics/src/tests/metricmanagertest.cpp b/metrics/src/tests/metricmanagertest.cpp
index 7159207e0ff..362cad83a66 100644
--- a/metrics/src/tests/metricmanagertest.cpp
+++ b/metrics/src/tests/metricmanagertest.cpp
@@ -144,7 +144,7 @@ struct MetricNameVisitor : public MetricVisitor {
MetricNameVisitor(bool debug_ = false) : debug(debug_) {}
virtual bool visitMetricSet(const MetricSet& metricSet,
- bool autoGenerated)
+ bool autoGenerated) override
{
if (debug) {
ost << "<" << (autoGenerated ? "*" : "")
@@ -152,13 +152,13 @@ struct MetricNameVisitor : public MetricVisitor {
}
return true;
}
- virtual void doneVisitingMetricSet(const MetricSet& metricSet) {
+ virtual void doneVisitingMetricSet(const MetricSet& metricSet) override {
if (debug) {
ost << "</" << metricSet.getPath() << ">\n";
}
}
- virtual bool visitMetric(const Metric& m, bool autoGenerated) {
+ virtual bool visitMetric(const Metric& m, bool autoGenerated) override {
ost << (autoGenerated ? "*" : "") << m.getPath() << "\n";
return true;
}
@@ -390,7 +390,7 @@ namespace {
struct FakeTimer : public MetricManager::Timer {
time_t _time;
FakeTimer(time_t startTime = 0) : _time(startTime) {}
- virtual time_t getTime() const { return _time; }
+ virtual time_t getTime() const override { return _time; }
};
struct BriefValuePrinter : public MetricVisitor {
@@ -399,7 +399,7 @@ namespace {
BriefValuePrinter() : count(0), ost() {}
- virtual bool visitMetric(const Metric& metric, bool) {
+ virtual bool visitMetric(const Metric& metric, bool) override {
if (++count > 1) ost << ",";
//ost << metric.getPath() << ":";
ost << metric.getDoubleValue("value");
diff --git a/metrics/src/tests/metricsettest.cpp b/metrics/src/tests/metricsettest.cpp
index 309794cad1e..176572acbd4 100644
--- a/metrics/src/tests/metricsettest.cpp
+++ b/metrics/src/tests/metricsettest.cpp
@@ -28,7 +28,7 @@ namespace {
TestMetricVisitor(uint32_t setsToVisit_ = 100)
: ost(), setsToVisit(setsToVisit_) {}
- virtual bool visitMetricSet(const MetricSet& set, bool autoGenerated) {
+ virtual bool visitMetricSet(const MetricSet& set, bool autoGenerated) override {
ost << "[" << (autoGenerated ? "*" : "") << set.getName() << "]\n";
if (setsToVisit > 0) {
--setsToVisit;
@@ -36,7 +36,7 @@ namespace {
}
return false;
}
- virtual bool visitMetric(const Metric& m, bool autoGenerated) {
+ virtual bool visitMetric(const Metric& m, bool autoGenerated) override {
ost << (autoGenerated ? "*" : "") << m.getName() << "\n";
return true;
}
diff --git a/metrics/src/tests/snapshottest.cpp b/metrics/src/tests/snapshottest.cpp
index 977f6e4ad68..bee3e910fb3 100644
--- a/metrics/src/tests/snapshottest.cpp
+++ b/metrics/src/tests/snapshottest.cpp
@@ -41,7 +41,7 @@ struct SubSubMetricSet : public MetricSet {
SubSubMetricSet(vespalib::stringref name, const LoadTypeSet& loadTypes_, MetricSet* owner = 0);
~SubSubMetricSet();
virtual MetricSet* clone(std::vector<Metric::UP> &ownerList, CopyType copyType,
- metrics::MetricSet* owner, bool includeUnused) const;
+ metrics::MetricSet* owner, bool includeUnused) const override;
void incValues();
};
@@ -194,7 +194,7 @@ struct FakeTimer : public MetricManager::Timer {
FakeTimer() : _timeInSecs(1) {}
- virtual time_t getTime() const { return _timeInSecs; }
+ virtual time_t getTime() const override { return _timeInSecs; }
};
} // End of anonymous namespace
diff --git a/metrics/src/tests/stresstest.cpp b/metrics/src/tests/stresstest.cpp
index 905a79252d1..5a2a736e9ba 100644
--- a/metrics/src/tests/stresstest.cpp
+++ b/metrics/src/tests/stresstest.cpp
@@ -108,7 +108,7 @@ OuterMetricSet::~OuterMetricSet() { }
//std::cerr << "Loadgiver thread joined\n";
}
- virtual void run() {
+ virtual void run() override {
uint64_t i = 0;
while (running()) {
++i;