aboutsummaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2019-02-01 13:30:06 +0100
committerTor Egge <Tor.Egge@broadpark.no>2019-02-01 13:30:06 +0100
commit82b73b25698258b978555d04b0fb34eba448c6bd (patch)
treec5212856402ec96be1b411a07aea5686b13e081a /document
parent809e726cb714fd357eec4de4553e0b5d331423ba (diff)
Adjust forward declarations in document.
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/annotation/annotation.h2
-rw-r--r--document/src/vespa/document/annotation/spannode.h2
-rw-r--r--document/src/vespa/document/annotation/spantree.h4
-rw-r--r--document/src/vespa/document/fieldvalue/structfieldvalue.h6
-rw-r--r--document/src/vespa/document/fieldvalue/tensorfieldvalue.h2
-rw-r--r--document/src/vespa/document/predicate/predicate.h2
-rw-r--r--document/src/vespa/document/predicate/predicate_builder.h2
-rw-r--r--document/src/vespa/document/predicate/predicate_slime_visitor.h2
-rw-r--r--document/src/vespa/document/repo/configbuilder.h2
-rw-r--r--document/src/vespa/document/repo/documenttyperepo.h2
-rw-r--r--document/src/vespa/document/serialization/annotationserializer.h2
11 files changed, 14 insertions, 14 deletions
diff --git a/document/src/vespa/document/annotation/annotation.h b/document/src/vespa/document/annotation/annotation.h
index f0cb8088b1f..94ffe12eb85 100644
--- a/document/src/vespa/document/annotation/annotation.h
+++ b/document/src/vespa/document/annotation/annotation.h
@@ -7,7 +7,7 @@
#include <memory>
namespace document {
-class SpanNode;
+struct SpanNode;
class Annotation {
const AnnotationType * _type;
diff --git a/document/src/vespa/document/annotation/spannode.h b/document/src/vespa/document/annotation/spannode.h
index 742b1534a33..0a5bbdcaab8 100644
--- a/document/src/vespa/document/annotation/spannode.h
+++ b/document/src/vespa/document/annotation/spannode.h
@@ -5,7 +5,7 @@
#include <vespa/vespalib/stllike/string.h>
namespace document {
-class SpanTreeVisitor;
+struct SpanTreeVisitor;
struct SpanNode {
typedef std::unique_ptr<SpanNode> UP;
diff --git a/document/src/vespa/document/annotation/spantree.h b/document/src/vespa/document/annotation/spantree.h
index 4acd39b4793..d181d755fae 100644
--- a/document/src/vespa/document/annotation/spantree.h
+++ b/document/src/vespa/document/annotation/spantree.h
@@ -7,8 +7,8 @@
#include <cassert>
namespace document {
-class SpanNode;
-class SpanTreeVisitor;
+struct SpanNode;
+struct SpanTreeVisitor;
class SpanTree {
typedef std::vector<Annotation> AnnotationVector;
diff --git a/document/src/vespa/document/fieldvalue/structfieldvalue.h b/document/src/vespa/document/fieldvalue/structfieldvalue.h
index 8025365be26..0a288aeb69d 100644
--- a/document/src/vespa/document/fieldvalue/structfieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/structfieldvalue.h
@@ -17,7 +17,7 @@ namespace document {
class Document;
class DocumentType;
class DocumentTypeRepo;
-class FieldValueWriter;
+struct FieldValueWriter;
class FixedTypeRepo;
class FieldSet;
class StructDataType;
@@ -123,8 +123,8 @@ private:
VESPA_DLL_LOCAL const StructDataType & getStructType() const;
// Iterator implementation
- class FieldIterator;
- friend class FieldIterator;
+ struct FieldIterator;
+ friend struct FieldIterator;
StructuredIterator::UP getIterator(const Field* toFind) const override;
diff --git a/document/src/vespa/document/fieldvalue/tensorfieldvalue.h b/document/src/vespa/document/fieldvalue/tensorfieldvalue.h
index 5c831601d1a..49088c587c6 100644
--- a/document/src/vespa/document/fieldvalue/tensorfieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/tensorfieldvalue.h
@@ -4,7 +4,7 @@
#include "fieldvalue.h"
-namespace vespalib { namespace tensor { class Tensor; } }
+namespace vespalib { namespace tensor { struct Tensor; } }
namespace document {
diff --git a/document/src/vespa/document/predicate/predicate.h b/document/src/vespa/document/predicate/predicate.h
index 97823a3ad2b..4c6351f5e4c 100644
--- a/document/src/vespa/document/predicate/predicate.h
+++ b/document/src/vespa/document/predicate/predicate.h
@@ -8,7 +8,7 @@
namespace vespalib {
class Slime;
-namespace slime { class Inspector; }
+namespace slime { struct Inspector; }
} // namespace vespalib
namespace document {
diff --git a/document/src/vespa/document/predicate/predicate_builder.h b/document/src/vespa/document/predicate/predicate_builder.h
index 14cb9eb6496..3750e3aa615 100644
--- a/document/src/vespa/document/predicate/predicate_builder.h
+++ b/document/src/vespa/document/predicate/predicate_builder.h
@@ -7,7 +7,7 @@
#include <vector>
namespace document {
-class PredicateNode;
+struct PredicateNode;
class PredicateBuilder : private PredicateSlimeVisitor {
std::vector<PredicateNode *>_nodes;
diff --git a/document/src/vespa/document/predicate/predicate_slime_visitor.h b/document/src/vespa/document/predicate/predicate_slime_visitor.h
index 5727a4d4269..394c72fe8dd 100644
--- a/document/src/vespa/document/predicate/predicate_slime_visitor.h
+++ b/document/src/vespa/document/predicate/predicate_slime_visitor.h
@@ -3,7 +3,7 @@
#pragma once
namespace vespalib {
-namespace slime { class Inspector; }
+namespace slime { struct Inspector; }
} // namespace vespalib
namespace document {
diff --git a/document/src/vespa/document/repo/configbuilder.h b/document/src/vespa/document/repo/configbuilder.h
index c389fd3b09e..856ffaeda08 100644
--- a/document/src/vespa/document/repo/configbuilder.h
+++ b/document/src/vespa/document/repo/configbuilder.h
@@ -11,7 +11,7 @@
namespace document::config_builder {
-class TypeOrId;
+struct TypeOrId;
struct DatatypeConfig : DocumenttypesConfig::Documenttype::Datatype {
static int32_t id_counter;
diff --git a/document/src/vespa/document/repo/documenttyperepo.h b/document/src/vespa/document/repo/documenttyperepo.h
index 68e4087ca49..f0c59918a74 100644
--- a/document/src/vespa/document/repo/documenttyperepo.h
+++ b/document/src/vespa/document/repo/documenttyperepo.h
@@ -15,7 +15,7 @@ namespace internal {
class AnnotationType;
class DataType;
-class DataTypeRepo;
+struct DataTypeRepo;
class DocumentType;
class DocumentTypeRepo {
diff --git a/document/src/vespa/document/serialization/annotationserializer.h b/document/src/vespa/document/serialization/annotationserializer.h
index a84087ce6d1..d8cdd833939 100644
--- a/document/src/vespa/document/serialization/annotationserializer.h
+++ b/document/src/vespa/document/serialization/annotationserializer.h
@@ -13,7 +13,7 @@ class Annotation;
class Span;
class SpanList;
class SimpleSpanList;
-class SpanNode;
+struct SpanNode;
class SpanTree;
class AnnotationSerializer : private SpanTreeVisitor {