aboutsummaryrefslogtreecommitdiffstats
path: root/configutil
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-02-06 00:57:55 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2017-02-06 17:57:25 +0100
commit1b9151ab93467dd5508cc9c63b674310df0ab0b3 (patch)
tree11e62fae250894b6e61d580bf95eaf7014fc5fce /configutil
parent65dcaa714247b95459495338f044e89446d9a986 (diff)
Optimize includes.
Diffstat (limited to 'configutil')
-rw-r--r--configutil/src/apps/configstatus/main.cpp8
-rw-r--r--configutil/src/apps/modelinspect/main.cpp7
-rw-r--r--configutil/src/lib/configstatus.cpp13
-rw-r--r--configutil/src/lib/tags.cpp5
4 files changed, 14 insertions, 19 deletions
diff --git a/configutil/src/apps/configstatus/main.cpp b/configutil/src/apps/configstatus/main.cpp
index e17ee658cc2..db411d309d1 100644
--- a/configutil/src/apps/configstatus/main.cpp
+++ b/configutil/src/apps/configstatus/main.cpp
@@ -1,13 +1,13 @@
// 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 <vespa/defaults.h>
-#include <vespa/log/log.h>
#include <vespa/vespalib/text/stringtokenizer.h>
-LOG_SETUP("vespa-config-status");
#include <iostream>
#include <lib/configstatus.h>
-#include <lib/hostfilter.h>
+#include <vespa/fastos/app.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-config-status");
class Application : public FastOS_Application {
ConfigStatus::Flags _flags;
diff --git a/configutil/src/apps/modelinspect/main.cpp b/configutil/src/apps/modelinspect/main.cpp
index 592bc8bdf8b..ca660791223 100644
--- a/configutil/src/apps/modelinspect/main.cpp
+++ b/configutil/src/apps/modelinspect/main.cpp
@@ -1,13 +1,14 @@
// 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 <vespa/defaults.h>
-#include <vespa/log/log.h>
-LOG_SETUP("vespa-model-inspect");
#include <iostream>
#include <lib/modelinspect.h>
#include <vespa/vespalib/text/stringtokenizer.h>
#include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/fastos/app.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-model-inspect");
class Application : public FastOS_Application
{
diff --git a/configutil/src/lib/configstatus.cpp b/configutil/src/lib/configstatus.cpp
index 5063a6d09cc..bd3b9cb43ea 100644
--- a/configutil/src/lib/configstatus.cpp
+++ b/configutil/src/lib/configstatus.cpp
@@ -1,19 +1,16 @@
// 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 <vespa/log/log.h>
-LOG_SETUP("vespa-config-status");
-#include <iostream>
-
+#include "configstatus.h"
+#include "tags.h"
#include <vespa/fnet/frt/frt.h>
#include <vespa/vespalib/data/slime/slime.h>
#include <vbench/http/http_result_handler.h>
#include <vbench/http/server_spec.h>
#include <vbench/http/http_client.h>
+#include <iostream>
-#include <lib/tags.h>
-
-#include "configstatus.h"
+#include <vespa/log/log.h>
+LOG_SETUP("vespa-config-status");
using configdefinitions::tagsContain;
diff --git a/configutil/src/lib/tags.cpp b/configutil/src/lib/tags.cpp
index 50b01c80ba2..8a20d1a1b6d 100644
--- a/configutil/src/lib/tags.cpp
+++ b/configutil/src/lib/tags.cpp
@@ -1,10 +1,7 @@
// 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 <vespa/vespalib/stllike/string.h>
-
#include "tags.h"
+#include <vespa/vespalib/stllike/string.h>
namespace configdefinitions {