Deinline destructors/constructors

2 files changed, 15 insertions, 9 deletions

diff --git a/filedistribution/src/apps/filedistributor/filedistributor.cpp b/filedistribution/src/apps/filedistributor/filedistributor.cpp
index c51182134a0..1d51c032e9c 100644
--- a/filedistribution/src/apps/filedistributor/filedistributor.cpp
+++ b/filedistribution/src/apps/filedistributor/filedistributor.cpp
@@ -137,14 +137,8 @@ class FileDistributor : public config::IFetcherCallback<ZookeepersConfig>,
 public:
     FileDistributor(const FileDistributor &) = delete;
     FileDistributor & operator = (const FileDistributor &) = delete;
-    FileDistributor()
-        : _configMutex(),
-          _completeReconfigurationNeeded(false),
-          _zooKeepersConfig(),
-          _fileDistributorConfig(),
-          _rpcConfig(),
-          _components()
-    { }
+    FileDistributor();
+    ~FileDistributor();
 
     void notifyGenerationChange(int64_t generation) {
         if (_components && ! completeReconfigurationNeeded()) {
@@ -232,6 +226,16 @@ public:
     }
 };
 
+FileDistributor::FileDistributor()
+    : _configMutex(),
+      _completeReconfigurationNeeded(false),
+      _zooKeepersConfig(),
+      _fileDistributorConfig(),
+      _rpcConfig(),
+      _components()
+{ }
+FileDistributor::~FileDistributor() { }
+
 class FileDistributorApplication : public FastOS_Application {
     const config::ConfigUri _configUri;
 public:
diff --git a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
index f9375fd607a..2412b00ecd6 100644
--- a/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
+++ b/filedistribution/src/vespa/filedistribution/distributor/filedistributortrackerimpl.cpp
@@ -88,7 +88,8 @@ TrackingTask::TrackingTask(Scheduler& scheduler,
 
 TrackingTask::~TrackingTask() {}
 
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Winline"
 //TODO: refactor
 void
 TrackingTask::doHandle() {
@@ -121,6 +122,7 @@ TrackingTask::doHandle() {
         }
     }
 }
+#pragma GCC diagnostic pop
 
 PeerEntries
 TrackingTask::getPeers(const std::shared_ptr<FileDownloader>& downloader) {