From 8422625dcbb5710f3d721625ced51ea805b166fe Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Sun, 18 Dec 2016 07:23:34 +0000
Subject: decouple slime from config.

---
 .../src/vespa/searchsummary/docsummary/attributedfw.cpp      |  4 ++--
 .../src/vespa/searchsummary/docsummary/docsumwriter.cpp      |  1 +
 .../src/vespa/searchsummary/docsummary/geoposdfw.cpp         | 10 +++++-----
 .../src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp   | 12 +++---------
 .../vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp    |  3 ++-
 5 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'searchsummary/src')

diff --git a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
index 5059e859e41..b0704b2d148 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/attributedfw.cpp
@@ -1,7 +1,5 @@
 // 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>
 #include <vespa/searchlib/attribute/stringbase.h>
 #include <vespa/searchlib/attribute/integerbase.h>
 #include <vespa/searchlib/attribute/floatbase.h>
@@ -11,7 +9,9 @@
 #include "docsumstate.h"
 #include <vespa/vespalib/tensor/tensor.h>
 #include <vespa/vespalib/tensor/serialization/slime_binary_format.h>
+#include <vespa/vespalib/data/slime/slime.h>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.attributedfw");
 
 using namespace search;
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
index f3272b2f574..f790d38e70e 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/docsumwriter.cpp
@@ -9,6 +9,7 @@
 #include <vespa/searchlib/common/transport.h>
 #include <vespa/searchlib/util/slime_output_raw_buf_adapter.h>
 #include <vespa/searchlib/attribute/iattributemanager.h>
+#include <vespa/vespalib/data/slime/slime.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.docsumwriter");
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp
index e15f0b8c986..efc6af32396 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/geoposdfw.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/log/log.h>
-LOG_SETUP(".searchlib.docsummary.geoposdfw");
 #include "geoposdfw.h"
 #include <vespa/searchlib/attribute/iattributemanager.h>
 #include <vespa/searchlib/common/documentlocations.h>
 #include <vespa/searchlib/common/location.h>
 #include <vespa/vespalib/util/jsonwriter.h>
+#include <vespa/vespalib/data/slime/cursor.h>
+
+#include <vespa/log/log.h>
+LOG_SETUP(".searchlib.docsummary.geoposdfw");
 
 namespace search {
 namespace docsummary {
@@ -17,8 +18,7 @@ using attribute::IAttributeContext;
 
 GeoPositionDFW::GeoPositionDFW(const vespalib::string & attrName) :
     AttrDFW(attrName)
-{
-}
+{ }
 
 namespace {
 
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
index 0d397c97a63..b81b1cc231d 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/rankfeaturesdfw.cpp
@@ -1,27 +1,21 @@
 // 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>
 #include <vespa/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
 #include "rankfeaturesdfw.h"
 #include <vespa/searchlib/common/feature.h>
 #include "docsumformat.h"
 #include "docsumstate.h"
-
-LOG_SETUP(".searchlib.docsummary.rankfeaturesdfw");
+#include <vespa/vespalib/data/slime/cursor.h>
 
 namespace search {
 namespace docsummary {
 
 RankFeaturesDFW::RankFeaturesDFW() :
     _env(NULL)
-{
-}
+{ }
 
-RankFeaturesDFW::~RankFeaturesDFW()
-{
-}
+RankFeaturesDFW::~RankFeaturesDFW() { }
 
 void
 RankFeaturesDFW::init(IDocsumEnvironment * env)
diff --git a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
index e2e03131e91..14a4383009b 100644
--- a/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
+++ b/searchsummary/src/vespa/searchsummary/docsummary/summaryfeaturesdfw.cpp
@@ -1,12 +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/searchlib/common/featureset.h>
 #include <vespa/searchlib/common/packets.h>
 #include "docsumformat.h"
 #include "summaryfeaturesdfw.h"
 #include "docsumstate.h"
+#include <vespa/vespalib/data/slime/cursor.h>
 #include <cmath>
+
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.docsummary.summaryfeaturesdfw");
 
-- 
cgit v1.2.3