Forward declare XmlOutputStream and FieldValue::IteratorHandler.

2 files changed, 7 insertions, 8 deletions

diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
index 56c95e7fbc7..7b5e5f17671 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp
@@ -368,7 +368,7 @@ SearchVisitorFactory::makeVisitor(StorageComponent& component,
 }
 
 void
-SearchVisitor::AttributeInserter::onPrimitive(uint32_t, const IteratorContent & c)
+SearchVisitor::AttributeInserter::onPrimitive(uint32_t, const Content & c)
 {
     const document::FieldValue & value = c.getValue();
     LOG(debug, "AttributeInserter: Adding value '%s'(%d) to attribute '%s' for docid '%d'",
@@ -402,13 +402,13 @@ SearchVisitor::PositionInserter::PositionInserter(search::AttributeVector & attr
 SearchVisitor::PositionInserter::~PositionInserter() {}
 
 void
-SearchVisitor::PositionInserter::onPrimitive(uint32_t, const IteratorContent & c)
+SearchVisitor::PositionInserter::onPrimitive(uint32_t, const Content & c)
 {
     (void) c;
 }
 
 void
-SearchVisitor::PositionInserter::onStructStart(const IteratorContent & c)
+SearchVisitor::PositionInserter::onStructStart(const Content & c)
 {
     const document::StructuredFieldValue & value = static_cast<const document::StructuredFieldValue &>(c.getValue());
     LOG(debug, "PositionInserter: Adding value '%s'(%d) to attribute '%s' for docid '%d'",
diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
index 7767a601ea4..47d6157525c 100644
--- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
+++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h
@@ -27,6 +27,7 @@
 #include <vespa/storage/visiting/visitor.h>
 #include <vespa/document/fieldvalue/fieldvalues.h>
 #include <vespa/documentapi/messagebus/messages/queryresultmessage.h>
+#include <vespa/document/fieldvalue/iteratorhandler.h>
 
 using namespace search::aggregation;
 
@@ -86,13 +87,12 @@ private:
      * This class gets callbacks when iterating through a field value and
      * inserts the values into a given attribute vector.
      **/
-    class AttributeInserter : public document::FieldValue::IteratorHandler {
+    class AttributeInserter : public document::fieldvalue::IteratorHandler {
     protected:
-        typedef document::FieldValue::IteratorHandler::Content IteratorContent;
         search::AttributeVector &      _attribute;
         search::AttributeVector::DocId _docId;
 
-        void onPrimitive(uint32_t fid, const IteratorContent & c) override;
+        void onPrimitive(uint32_t fid, const Content & c) override;
 
     public:
         AttributeInserter(search::AttributeVector & attribute, search::AttributeVector::DocId docId);
@@ -103,7 +103,7 @@ private:
         PositionInserter(search::AttributeVector & attribute, search::AttributeVector::DocId docId);
         ~PositionInserter();
     private:
-        void onPrimitive(uint32_t fid, const IteratorContent & c) override;
+        void onPrimitive(uint32_t fid, const Content & c) override;
         void onStructStart(const Content & fv) override;
         document::Field _fieldX;
         document::Field _fieldY;
@@ -466,4 +466,3 @@ public:
 };
 
 }
-