diff options
Diffstat (limited to 'metrics')
| -rw-r--r-- | metrics/src/vespa/metrics/valuemetric.h | 3 | ||||
| -rw-r--r-- | metrics/src/vespa/metrics/valuemetric.hpp | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/metrics/src/vespa/metrics/valuemetric.h b/metrics/src/vespa/metrics/valuemetric.h index 3470aa067e0..9d5f0a82735 100644 --- a/metrics/src/vespa/metrics/valuemetric.h +++ b/metrics/src/vespa/metrics/valuemetric.h @@ -37,7 +37,6 @@ protected: void logWarning(const char* msg, const char *op) const; void logNonFiniteValueWarning() const; - void sendLogEvent(Metric::String name, double value) const; }; template<typename AvgVal, typename TotVal, bool SumOnAdd> @@ -86,7 +85,7 @@ public: ~ValueMetric(); MetricValueClass::UP getValues() const override { - return MetricValueClass::UP(new Values(_values.getValues())); + return std::make_unique<Values>(_values.getValues()); } void unsetOnZeroValue() { _values.setFlag(UNSET_ON_ZERO_VALUE); } diff --git a/metrics/src/vespa/metrics/valuemetric.hpp b/metrics/src/vespa/metrics/valuemetric.hpp index a9522dcec29..5e0ef95e9e5 100644 --- a/metrics/src/vespa/metrics/valuemetric.hpp +++ b/metrics/src/vespa/metrics/valuemetric.hpp @@ -26,7 +26,7 @@ ValueMetric<AvgVal, TotVal, SumOnAdd>::ValueMetric( {} template<typename AvgVal, typename TotVal, bool SumOnAdd> -ValueMetric<AvgVal, TotVal, SumOnAdd>::~ValueMetric() { } +ValueMetric<AvgVal, TotVal, SumOnAdd>::~ValueMetric() = default; template<typename AvgVal, typename TotVal, bool SumOnAdd> void ValueMetric<AvgVal, TotVal, SumOnAdd>::inc(AvgVal incVal) @@ -239,8 +239,7 @@ ValueMetric<AvgVal, TotVal, SumOnAdd>::getDoubleValue(stringref id) const template<typename AvgVal, typename TotVal, bool SumOnAdd> void -ValueMetric<AvgVal, TotVal, SumOnAdd>::addMemoryUsage( - MemoryConsumption& mc) const +ValueMetric<AvgVal, TotVal, SumOnAdd>::addMemoryUsage(MemoryConsumption& mc) const { ++mc._valueMetricCount; mc._valueMetricValues += _values.getMemoryUsageAllocatedInternally(); |