Implement a default destructor to avoid the automatic inlining of large destructors.

2 files changed, 13 insertions, 10 deletions

diff --git a/slobrok/src/vespa/slobrok/server/visible_map.cpp b/slobrok/src/vespa/slobrok/server/visible_map.cpp
index 6d9ce1b4c19..b041736a2ed 100644
--- a/slobrok/src/vespa/slobrok/server/visible_map.cpp
+++ b/slobrok/src/vespa/slobrok/server/visible_map.cpp
@@ -1,12 +1,10 @@
 // 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 "visible_map.h"
 
 #include <vespa/log/log.h>
 LOG_SETUP(".vismap");
 
-#include "visible_map.h"
-#include "named_service.h"
-
 namespace slobrok {
 
 void
@@ -144,7 +142,15 @@ VisibleMap::history(const vespalib::GenCnt& gen) const
     return retval;
 }
 
+VisibleMap::MapDiff::MapDiff() {}
+VisibleMap::MapDiff::~MapDiff() {}
 
+VisibleMap::VisibleMap()
+    : _map(NULL),
+      _waitList(),
+      _genCnt(1)
+{
+}
 VisibleMap::~VisibleMap()
 {
     aborted();
diff --git a/slobrok/src/vespa/slobrok/server/visible_map.h b/slobrok/src/vespa/slobrok/server/visible_map.h
index d67cb9ace70..11702ddb92a 100644
--- a/slobrok/src/vespa/slobrok/server/visible_map.h
+++ b/slobrok/src/vespa/slobrok/server/visible_map.h
@@ -44,6 +44,8 @@ public:
 
     struct MapDiff
     {
+        MapDiff();
+        ~MapDiff();
         std::vector<std::string> removed;
         RpcSrvlist               updated;
     };
@@ -83,12 +85,7 @@ public:
 
     MapDiff history(const vespalib::GenCnt& gen) const;
 
-    VisibleMap()
-        : _map(NULL),
-          _waitList(),
-          _genCnt(1)
-    {
-    }
+    VisibleMap();
     ~VisibleMap();
 };