1 files changed, 9 insertions, 4 deletions
diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
index 025103e4e3d..d481d7d2ce9 100644
--- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
+++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp
@@ -8,8 +8,6 @@ LOG_SETUP(".slobrok.server.local_rpc_monitor_map");
 
 namespace slobrok {
 
-#pragma GCC diagnostic ignored "-Winline"
-
 namespace {
 
 struct ChainedCompletionHandler : CompletionHandler {
@@ -25,9 +23,11 @@ struct ChainedCompletionHandler : CompletionHandler {
         first->doneHandler(result);
         second->doneHandler(result);
     }
-    ~ChainedCompletionHandler() override {}
+    ~ChainedCompletionHandler() override;
 };
 
+ChainedCompletionHandler::~ChainedCompletionHandler() = default;
+
 }
 
 void LocalRpcMonitorMap::DelayedTasks::PerformTask() {
@@ -45,6 +45,12 @@ void LocalRpcMonitorMap::DelayedTasks::PerformTask() {
     }
 }
 
+LocalRpcMonitorMap::PerService::~PerService() = default;
+LocalRpcMonitorMap::PerService::PerService(PerService &&) noexcept = default;
+LocalRpcMonitorMap::PerService & LocalRpcMonitorMap::PerService::operator =(PerService &&) noexcept = default;
+
+LocalRpcMonitorMap::RemovedData::~RemovedData() = default;
+
 LocalRpcMonitorMap::LocalRpcMonitorMap(FNET_Scheduler *scheduler,
                                        MappingMonitorFactory mappingMonitorFactory)
   : _delayedTasks(scheduler, *this),
@@ -178,7 +184,6 @@ void LocalRpcMonitorMap::removeLocal(const ServiceMapping &mapping) {
         _dispatcher.remove(mapping);            
     }
     _mappingMonitor->start(mapping, false);
-    return;
 }
 
 void LocalRpcMonitorMap::add(const ServiceMapping &mapping) {