Fix warnings hidden earlier due to including application headers as system includes

2 files changed, 6 insertions, 18 deletions

diff --git a/slobrok/src/vespa/slobrok/server/CMakeLists.txt b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
index 2ac6b28a8b2..92ce4a4d19b 100644
--- a/slobrok/src/vespa/slobrok/server/CMakeLists.txt
+++ b/slobrok/src/vespa/slobrok/server/CMakeLists.txt
@@ -2,6 +2,7 @@
 vespa_add_library(slobrok_slobrokserver
     SOURCES
     cmd.cpp
+    configshim.cpp
     exchange_manager.cpp
     history.cpp
     i_rpc_server_manager.cpp
diff --git a/slobrok/src/vespa/slobrok/server/configshim.h b/slobrok/src/vespa/slobrok/server/configshim.h
index 1b80ceb7eab..4140a4a34ca 100644
--- a/slobrok/src/vespa/slobrok/server/configshim.h
+++ b/slobrok/src/vespa/slobrok/server/configshim.h
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <string>
 #include <vespa/slobrok/cfg.h>
+#include <string>
 
 namespace slobrok {
 
@@ -15,29 +15,16 @@ private:
     ConfiguratorFactory _factory;
 
 public:
-    ConfigShim(uint32_t port)
-        : _port(port), _statePort(0), _configId(""),
-          _factory(config::ConfigUri::createEmpty()) {}
-
-    ConfigShim(uint32_t port, uint32_t statePort_in, const std::string& cfgId)
-        : _port(port), _statePort(statePort_in), _configId(cfgId),
-          _factory(config::ConfigUri(_configId)) {}
-
-    ConfigShim(uint32_t port, const std::string& cfgId,
-               config::IConfigContext::SP cfgCtx)
-        : _port(port), _statePort(0), _configId(cfgId),
-          _factory(config::ConfigUri(cfgId, cfgCtx)) {}
+    ConfigShim(uint32_t port);
+    ConfigShim(uint32_t port, uint32_t statePort_in, const std::string& cfgId);
+    ConfigShim(uint32_t port, const std::string& cfgId, config::IConfigContext::SP cfgCtx);
+    ~ConfigShim();
 
     uint32_t portNumber() const { return _port; }
-
     uint32_t statePort() const { return _statePort; }
-
     std::string configId() const { return _configId; }
-
     const char *id() const { return _configId.c_str(); }
-
     const ConfiguratorFactory & factory() const { return _factory; }
 };
 
 } // namespace slobrok
-