diff options
Diffstat (limited to 'metrics/src')
-rw-r--r-- | metrics/src/vespa/metrics/countmetricvalues.cpp | 2 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/memoryconsumption.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metric.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/summetric.h | 2 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/valuemetricvalues.cpp | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/metrics/src/vespa/metrics/countmetricvalues.cpp b/metrics/src/vespa/metrics/countmetricvalues.cpp index 7fe3bb5b8ca..76ab2d4d83a 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.cpp +++ b/metrics/src/vespa/metrics/countmetricvalues.cpp @@ -4,6 +4,6 @@ namespace metrics { -template class CountMetricValues<uint64_t>; +template struct CountMetricValues<uint64_t>; } // metrics diff --git a/metrics/src/vespa/metrics/memoryconsumption.h b/metrics/src/vespa/metrics/memoryconsumption.h index 1cbd8f1deab..9b2e0ec0254 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.h +++ b/metrics/src/vespa/metrics/memoryconsumption.h @@ -21,8 +21,8 @@ namespace metrics { -class SeenStrings; -class SnapShotUsage; +struct SeenStrings; +struct SnapShotUsage; class MemoryConsumption : public vespalib::Printable { public: diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h index d1313c3ca1a..85832ba08d1 100644 --- a/metrics/src/vespa/metrics/metric.h +++ b/metrics/src/vespa/metrics/metric.h @@ -8,8 +8,8 @@ namespace metrics { -class AbstractCountMetric; -class AbstractValueMetric; +struct AbstractCountMetric; +struct AbstractValueMetric; class Metric; class MetricSet; class MetricSnapshot; diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 4089236ca48..3b8de5927ec 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -274,8 +274,8 @@ public: private: void takeSnapshots(const MetricLockGuard &, time_t timeToProcess); - friend class MetricManagerTest; - friend class SnapshotTest; + friend struct MetricManagerTest; + friend struct SnapshotTest; void configure(const MetricLockGuard & guard, std::unique_ptr<MetricsmanagerConfig> conf); void run() override; diff --git a/metrics/src/vespa/metrics/summetric.h b/metrics/src/vespa/metrics/summetric.h index a9827bcca7d..c461fb25313 100644 --- a/metrics/src/vespa/metrics/summetric.h +++ b/metrics/src/vespa/metrics/summetric.h @@ -72,7 +72,7 @@ public: void addToSnapshot(Metric&, std::vector<Metric::UP> &) const override; private: - friend class MetricManagerTest; + friend struct MetricManagerTest; std::pair<std::vector<Metric::UP>, Metric::UP> generateSum() const; virtual void addTo(Metric&, std::vector<Metric::UP> *ownerList) const; diff --git a/metrics/src/vespa/metrics/valuemetricvalues.cpp b/metrics/src/vespa/metrics/valuemetricvalues.cpp index 12928db08dd..f309b07b1a4 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.cpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.cpp @@ -3,10 +3,10 @@ namespace metrics { -template class ValueMetricValues<int64_t, int64_t>; +template struct ValueMetricValues<int64_t, int64_t>; template std::ostream & operator << (std::ostream & os, const ValueMetricValues<int64_t, int64_t> & v); -template class ValueMetricValues<double, double>; +template struct ValueMetricValues<double, double>; template std::ostream & operator << (std::ostream & os, const ValueMetricValues<double, double> & v); } // metrics |