diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 15:11:38 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 09:50:23 +0200 |
commit | ece112cf6aadbf135c92f1d5ddada739b290a118 (patch) | |
tree | 3fb49a56dcfd77e27ee335f5be1f172d3a7975c9 /vsm/src | |
parent | 8438c19df2999aed6fd89c470c52a9c04c77dcdc (diff) |
Forward declare XmlOutputStream and FieldValue::IteratorHandler.
Diffstat (limited to 'vsm/src')
-rw-r--r-- | vsm/src/vespa/vsm/common/document.h | 1 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/searcher/fieldsearcher.h | 4 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/docsumfilter.cpp | 4 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/flattendocsumwriter.h | 5 | ||||
-rw-r--r-- | vsm/src/vespa/vsm/vsm/snippetmodifier.h | 5 |
5 files changed, 9 insertions, 10 deletions
diff --git a/vsm/src/vespa/vsm/common/document.h b/vsm/src/vespa/vsm/common/document.h index a0341aaf7c0..ea0f9216ab9 100644 --- a/vsm/src/vespa/vsm/common/document.h +++ b/vsm/src/vespa/vsm/common/document.h @@ -4,6 +4,7 @@ #include <vespa/searchlib/query/base.h> #include <vespa/document/fieldvalue/fieldvalue.h> #include <vespa/vespalib/stllike/hash_map.h> +#include <map> namespace vespalib { class asciistream; diff --git a/vsm/src/vespa/vsm/searcher/fieldsearcher.h b/vsm/src/vespa/vsm/searcher/fieldsearcher.h index 3b82f68072b..e28275536f3 100644 --- a/vsm/src/vespa/vsm/searcher/fieldsearcher.h +++ b/vsm/src/vespa/vsm/searcher/fieldsearcher.h @@ -4,6 +4,7 @@ #include <vespa/searchlib/query/query.h> #include <vespa/vsm/common/document.h> #include <vespa/vsm/common/storagedocument.h> +#include <vespa/document/fieldvalue/iteratorhandler.h> namespace vsm { @@ -79,9 +80,8 @@ public: size_t maxFieldLength() const { return _maxFieldLength; } private: - class IteratorHandler : public document::FieldValue::IteratorHandler { + class IteratorHandler : public document::fieldvalue::IteratorHandler { private: - typedef document::FieldValue::IteratorHandler::Content Content; FieldSearcher & _searcher; void onPrimitive(uint32_t fid, const Content & c) override; diff --git a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp index 961add6d7d6..b7ed6c0b7da 100644 --- a/vsm/src/vespa/vsm/vsm/docsumfilter.cpp +++ b/vsm/src/vespa/vsm/vsm/docsumfilter.cpp @@ -4,6 +4,7 @@ #include "slimefieldwriter.h" #include <vespa/searchsummary/docsummary/summaryfieldconverter.h> #include <vespa/document/base/exceptions.h> +#include <vespa/document/fieldvalue/iteratorhandler.h> #include <vespa/log/log.h> LOG_SETUP(".vsm.docsumfilter"); @@ -13,9 +14,8 @@ using namespace search::docsummary; namespace { -class Handler : public document::FieldValue::IteratorHandler { +class Handler : public document::fieldvalue::IteratorHandler { public: - typedef document::FieldValue::IteratorHandler::Content Content; }; struct IntResultHandler : public Handler { diff --git a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h b/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h index 9c6ba8dae9c..aa58a6ae6df 100644 --- a/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h +++ b/vsm/src/vespa/vsm/vsm/flattendocsumwriter.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/document/fieldvalue/fieldvalue.h> +#include <vespa/document/fieldvalue/iteratorhandler.h> #include <vespa/vsm/common/charbuffer.h> namespace vsm { @@ -10,10 +11,8 @@ namespace vsm { * This class is used to flatten out and write a complex field value. * A separator string is inserted between primitive field values. **/ -class FlattenDocsumWriter : public document::FieldValue::IteratorHandler { +class FlattenDocsumWriter : public document::fieldvalue::IteratorHandler { private: - typedef document::FieldValue::IteratorHandler::Content Content; - CharBuffer _output; vespalib::string _separator; bool _useSeparator; diff --git a/vsm/src/vespa/vsm/vsm/snippetmodifier.h b/vsm/src/vespa/vsm/vsm/snippetmodifier.h index 17d6bb44d4c..182f09d5d55 100644 --- a/vsm/src/vespa/vsm/vsm/snippetmodifier.h +++ b/vsm/src/vespa/vsm/vsm/snippetmodifier.h @@ -7,6 +7,7 @@ #include <vespa/vsm/common/fieldmodifier.h> #include <vespa/vsm/searcher/utf8substringsnippetmodifier.h> #include <vespa/document/fieldvalue/fieldvalue.h> +#include <vespa/document/fieldvalue/iteratorhandler.h> namespace vsm { @@ -19,11 +20,9 @@ namespace vsm { * responsible for modifying the field value by inserting unit separators before and after matches. * A group separator is inserted between primitive field values the same way as done by FlattenDocsumWriter. **/ -class SnippetModifier : public FieldModifier, public document::FieldValue::IteratorHandler +class SnippetModifier : public FieldModifier, public document::fieldvalue::IteratorHandler { private: - typedef document::FieldValue::IteratorHandler::Content Content; - UTF8SubstringSnippetModifier::SP _searcher; CharBuffer::SP _valueBuf; // buffer to store the final modified field value char _groupSep; |