Tidy up some existing code

2 files changed, 25 insertions, 27 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
index a65ac32cd47..8f56040035c 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.cpp
@@ -9,7 +9,7 @@ namespace storage {
 using metrics::MetricSet;
 using metrics::LoadTypeSet;
 
-FileStorThreadMetrics::Op::Op(const std::string& id, const std::string name, MetricSet* owner)
+FileStorThreadMetrics::Op::Op(const std::string& id, const std::string& name, MetricSet* owner)
     : MetricSet(id, id, name + " load in filestor thread", owner, "operationtype"),
       _name(name),
       count("count", "yamasdefault", "Number of requests processed.", this),
@@ -17,7 +17,7 @@ FileStorThreadMetrics::Op::Op(const std::string& id, const std::string name, Met
       failed("failed", "yamasdefault", "Number of failed requests.", this)
 { }
 
-FileStorThreadMetrics::Op::~Op() { }
+FileStorThreadMetrics::Op::~Op() = default;
 
 MetricSet *
 FileStorThreadMetrics::Op::clone(std::vector<Metric::UP>& ownerList,
@@ -57,15 +57,13 @@ FileStorThreadMetrics::OpWithRequestSize<BaseOp>::clone(
             ->assignValues(*this));
 }
 
-template class FileStorThreadMetrics::OpWithRequestSize<FileStorThreadMetrics::Op>;
-
-FileStorThreadMetrics::OpWithNotFound::OpWithNotFound(const std::string& id, const std::string name, MetricSet* owner)
+FileStorThreadMetrics::OpWithNotFound::OpWithNotFound(const std::string& id, const std::string& name, MetricSet* owner)
     : Op(id, name, owner),
       notFound("not_found", "", "Number of requests that could not be "
                "completed due to source document not found.", this)
 { }
 
-FileStorThreadMetrics::OpWithNotFound::~OpWithNotFound() { }
+FileStorThreadMetrics::OpWithNotFound::~OpWithNotFound() = default;
 
 MetricSet *
 FileStorThreadMetrics::OpWithNotFound::clone(std::vector<Metric::UP>& ownerList,
@@ -86,7 +84,7 @@ FileStorThreadMetrics::Update::Update(MetricSet* owner)
       latencyRead("latency_read", "", "Latency of the source read in the request.", this)
 { }
 
-FileStorThreadMetrics::Update::~Update() { }
+FileStorThreadMetrics::Update::~Update() = default;
 
 MetricSet *
 FileStorThreadMetrics::Update::clone(std::vector<Metric::UP>& ownerList,
@@ -105,7 +103,7 @@ FileStorThreadMetrics::Visitor::Visitor(MetricSet* owner)
       documentsPerIterate("docs", "", "Number of entries read per iterate call", this)
 { }
 
-FileStorThreadMetrics::Visitor::~Visitor() { }
+FileStorThreadMetrics::Visitor::~Visitor() = default;
 
 MetricSet *
 FileStorThreadMetrics::Visitor::clone(std::vector<Metric::UP>& ownerList,
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
index 588033360ec..afffb3da126 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormetrics.h
@@ -19,14 +19,14 @@ struct FileStorThreadMetrics : public metrics::MetricSet
 {
     typedef std::shared_ptr<FileStorThreadMetrics> SP;
 
-    struct Op : public metrics::MetricSet {
+    struct Op : metrics::MetricSet {
         std::string _name;
         metrics::LongCountMetric count;
         metrics::DoubleAverageMetric latency;
         metrics::LongCountMetric failed;
 
-        Op(const std::string& id, const std::string name, MetricSet* owner = 0);
-        ~Op();
+        Op(const std::string& id, const std::string& name, MetricSet* owner = nullptr);
+        ~Op() override;
 
         MetricSet * clone(std::vector<Metric::UP>& ownerList, CopyType copyType,
                           MetricSet* owner, bool includeUnused) const override;
@@ -37,40 +37,40 @@ struct FileStorThreadMetrics : public metrics::MetricSet
     struct OpWithRequestSize : BaseOp {
         metrics::LongAverageMetric request_size;
 
-        OpWithRequestSize(const std::string& id, const std::string& name, MetricSet* owner = 0);
-        ~OpWithRequestSize();
+        OpWithRequestSize(const std::string& id, const std::string& name, MetricSet* owner = nullptr);
+        ~OpWithRequestSize() override;
 
         MetricSet * clone(std::vector<Metric::UP>& ownerList, CopyType copyType,
                           MetricSet* owner, bool includeUnused) const override;
         OpWithRequestSize* operator&() { return this; }
     };
 
-    struct OpWithNotFound : public Op {
+    struct OpWithNotFound : Op {
         metrics::LongCountMetric notFound;
 
-        OpWithNotFound(const std::string& id, const std::string name, metrics::MetricSet* owner = 0);
-        ~OpWithNotFound();
+        OpWithNotFound(const std::string& id, const std::string& name, metrics::MetricSet* owner = nullptr);
+        ~OpWithNotFound() override;
         MetricSet* clone(std::vector<Metric::UP>& ownerList, CopyType copyType,
                          MetricSet* owner, bool includeUnused) const override;
         OpWithNotFound* operator&() { return this; }
     };
 
-    struct Update : public OpWithRequestSize<OpWithNotFound> {
+    struct Update : OpWithRequestSize<OpWithNotFound> {
         metrics::LongAverageMetric latencyRead;
 
-        Update(MetricSet* owner = 0);
-        ~Update();
+        explicit Update(MetricSet* owner = nullptr);
+        ~Update() override;
 
         MetricSet* clone(std::vector<Metric::UP>& ownerList, CopyType copyType,
                          MetricSet* owner, bool includeUnused) const override;
         Update* operator&() { return this; }
     };
 
-    struct Visitor : public Op {
+    struct Visitor : Op {
         metrics::LongAverageMetric documentsPerIterate;
 
-        Visitor(MetricSet* owner = 0);
-        ~Visitor();
+        explicit Visitor(MetricSet* owner = nullptr);
+        ~Visitor() override;
 
         MetricSet * clone(std::vector<Metric::UP>& ownerList, CopyType copyType,
                          MetricSet* owner, bool includeUnused) const override;
@@ -116,7 +116,7 @@ struct FileStorThreadMetrics : public metrics::MetricSet
     metrics::LongAverageMetric batchingSize;
 
     FileStorThreadMetrics(const std::string& name, const std::string& desc, const metrics::LoadTypeSet& lt);
-    ~FileStorThreadMetrics();
+    ~FileStorThreadMetrics() override;
 };
 
 class FileStorStripeMetrics : public metrics::MetricSet
@@ -126,7 +126,7 @@ public:
     metrics::LoadMetric<metrics::DoubleAverageMetric> averageQueueWaitingTime;
     FileStorStripeMetrics(const std::string& name, const std::string& description,
                           const metrics::LoadTypeSet& loadTypes);
-    ~FileStorStripeMetrics();
+    ~FileStorStripeMetrics() override;
 };
 
 class FileStorDiskMetrics : public metrics::MetricSet
@@ -146,7 +146,7 @@ public:
 
     FileStorDiskMetrics(const std::string& name, const std::string& description,
                         const metrics::LoadTypeSet& loadTypes, MetricSet* owner);
-    ~FileStorDiskMetrics();
+    ~FileStorDiskMetrics() override;
 
     void initDiskMetrics(const metrics::LoadTypeSet& loadTypes, uint32_t numStripes, uint32_t threadsPerDisk);
 };
@@ -159,8 +159,8 @@ struct FileStorMetrics : public metrics::MetricSet
     metrics::LongCountMetric partitionEvents;
     metrics::LongCountMetric diskEvents;
 
-    FileStorMetrics(const metrics::LoadTypeSet&);
-    ~FileStorMetrics();
+    explicit FileStorMetrics(const metrics::LoadTypeSet&);
+    ~FileStorMetrics() override;
 
     void initDiskMetrics(uint16_t numDisks, const metrics::LoadTypeSet& loadTypes, uint32_t numStripes, uint32_t threadsPerDisk);
 };