Fix warnings hidden earlier due to including application headers as system includes

3 files changed, 17 insertions, 23 deletions

diff --git a/filedistribution/src/vespa/filedistribution/model/mockfiledistributionmodel.h b/filedistribution/src/vespa/filedistribution/model/mockfiledistributionmodel.h
index cdc77692017..2598a2a8ef6 100644
--- a/filedistribution/src/vespa/filedistribution/model/mockfiledistributionmodel.h
+++ b/filedistribution/src/vespa/filedistribution/model/mockfiledistributionmodel.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include "filedistributionmodel.h"
-
 #include <algorithm>
 #include <vector>
 
@@ -11,12 +10,11 @@ namespace filedistribution {
 class MockFileDBModel : public FileDBModel {
     std::vector<std::string> _fileReferences;
 public:
-//Overrides
-    bool hasFile(const std::string& fileReference) {
+    bool hasFile(const std::string& fileReference) override {
         return std::find(_fileReferences.begin(), _fileReferences.end(), fileReference) != _fileReferences.end();
     }
 
-    void addFile(const std::string& fileReference, const Buffer & buffer) {
+    void addFile(const std::string& fileReference, const Buffer & buffer) override {
         (void)buffer;
         _fileReferences.push_back(fileReference);
     }
@@ -28,28 +26,24 @@ public:
         return result;
     }
 
-    virtual void cleanFiles(const std::vector<std::string> &) {}
-
+    void cleanFiles(const std::vector<std::string> &) override {}
 
-    virtual void setDeployedFilesToDownload(const std::string&,
-            const std::string&,
-            const std::vector<std::string> &) {}
-    virtual void cleanDeployedFilesToDownload(
-            const std::vector<std::string> &,
-            const std::string&) {}
-    virtual void removeDeploymentsThatHaveDifferentApplicationId(
-            const std::vector<std::string> &,
-            const std::string&) {}
+    void setDeployedFilesToDownload(const std::string&, const std::string&,
+                                    const std::vector<std::string> &) override {}
+    void cleanDeployedFilesToDownload(const std::vector<std::string> &,
+                                      const std::string&) override {}
+    void removeDeploymentsThatHaveDifferentApplicationId(const std::vector<std::string> &,
+                                                         const std::string&) override {}
 
-    virtual std::vector<std::string> getHosts() {
+    std::vector<std::string> getHosts() override {
         return std::vector<std::string>();
     }
 
-    virtual HostStatus getHostStatus(const std::string&) {
+    HostStatus getHostStatus(const std::string&) override {
         return HostStatus();
     }
 
-    Progress getProgress(const std::string&, const std::vector<std::string>&) {
+    Progress getProgress(const std::string&, const std::vector<std::string>&) override {
         return Progress();
     }
 };
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
index a249aefd8e2..5198b6bbeb7 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
+++ b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.cpp
@@ -1,15 +1,13 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include "filedistributionmodel.h"
-
-#include <ostream>
-#include <algorithm>
 
+#include "filedistributionmodel.h"
 #include "zkfacade.h"
 #include "zkfiledbmodel.h"
 #include "deployedfilestodownload.h"
 #include <vespa/filedistribution/common/logfwd.h>
 #include <sys/file.h>
+#include <ostream>
+#include <algorithm>
 
 namespace fs = boost::filesystem;
 
@@ -249,6 +247,7 @@ ZKFileDBModel::ZKFileDBModel(const std::shared_ptr<ZKFacade>& zk)
     createNode(_hostsPath, *_zk);
 }
 
+ZKFileDBModel::~ZKFileDBModel() {}
 
 char
 ZKFileDBModel::getProgress(const Path& path) {
diff --git a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.h b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.h
index 126d9da3424..31aaefabd2b 100644
--- a/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.h
+++ b/filedistribution/src/vespa/filedistribution/model/zkfiledbmodel.h
@@ -46,6 +46,7 @@ public:
     HostStatus getHostStatus(const std::string& hostName) override;
 
     ZKFileDBModel(const std::shared_ptr<ZKFacade>& zk);
+    ~ZKFileDBModel();
 
     Progress getProgress(const std::string& fileReference,
                          const std::vector<std::string>& hostsSortedAscending) override;