diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-13 11:32:52 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-13 11:51:00 +0200 |
commit | ac1d8b274911cf1f71e751646ca6aed260213934 (patch) | |
tree | 6066792bd6244e8393a4fbc700d9c4f99596372b /storageserver | |
parent | 025b759b5cf0146cd0cf3f44f686eeace1b28d09 (diff) |
Cleanup while looking for missing join.
Diffstat (limited to 'storageserver')
-rw-r--r-- | storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp | 4 | ||||
-rw-r--r-- | storageserver/src/vespa/storageserver/app/servicelayerprocess.h | 5 |
2 files changed, 4 insertions, 5 deletions
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 { |