From ac1d8b274911cf1f71e751646ca6aed260213934 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 13 Oct 2017 11:32:52 +0200
Subject: Cleanup while looking for missing join.

---
 storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp | 4 ++--
 storageserver/src/vespa/storageserver/app/servicelayerprocess.h   | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'storageserver/src')

diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
index 20868e79fce..2ca29223254 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
@@ -17,7 +17,7 @@ void
 ServiceLayerProcess::shutdown()
 {
     Process::shutdown();
-    _node.reset(0);
+    _node.reset();
 }
 
 void
@@ -25,7 +25,7 @@ ServiceLayerProcess::createNode()
 {
     _externalVisitors["searchvisitor"].reset(new SearchVisitorFactory(_configUri));
     setupProvider();
-    _node.reset(new ServiceLayerNode(_configUri, _context, *this, getProvider(), _externalVisitors));
+    _node = std::make_unique<ServiceLayerNode>(_configUri, _context, *this, getProvider(), _externalVisitors);
     _node->init();
 }
 
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
index 0a002db114b..af991c00f03 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
@@ -19,9 +19,8 @@
 #include "process.h"
 #include <vespa/storage/storageserver/servicelayernodecontext.h>
 #include <vespa/storage/common/visitorfactory.h>
-#include <vespa/config/config.h>
-#include <vespa/config/helper/configfetcher.h>
-#include <vespa/config-persistence.h>
+
+namespace config { class ConfigUri; }
 
 namespace storage {
 
-- 
cgit v1.2.3