Adjust forward declarations in searchlib.

21 files changed, 26 insertions, 26 deletions

diff --git a/searchlib/src/vespa/searchlib/aggregation/grouping.h b/searchlib/src/vespa/searchlib/aggregation/grouping.h
index c84259578bc..1d71eb0c0aa 100644
--- a/searchlib/src/vespa/searchlib/aggregation/grouping.h
+++ b/searchlib/src/vespa/searchlib/aggregation/grouping.h
@@ -8,7 +8,7 @@
 namespace search {
 
 class BitVector;
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 namespace aggregation {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/attributevector.h b/searchlib/src/vespa/searchlib/attribute/attributevector.h
index 1e8dfd6658a..af308044292 100644
--- a/searchlib/src/vespa/searchlib/attribute/attributevector.h
+++ b/searchlib/src/vespa/searchlib/attribute/attributevector.h
@@ -45,7 +45,7 @@ namespace search {
     class AttributeSaver;
     class EnumStoreBase;
     class IAttributeSaveTarget;
-    class IDocumentWeightAttribute;
+    struct IDocumentWeightAttribute;
     class QueryTermSimple;
     class QueryTermBase;
 
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
index 95fa65e98eb..e6356866ed9 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector.h
@@ -8,7 +8,7 @@
 
 namespace search {
 
-class IDocumentMetaStoreContext;
+struct IDocumentMetaStoreContext;
 
 namespace attribute {
 
diff --git a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_factory.h b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_factory.h
index c8836c0be1f..994d2b22ab9 100644
--- a/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_factory.h
+++ b/searchlib/src/vespa/searchlib/attribute/imported_attribute_vector_factory.h
@@ -7,7 +7,7 @@
 
 namespace search {
 
-class IDocumentMetaStoreContext;
+struct IDocumentMetaStoreContext;
 
 namespace attribute {
 
diff --git a/searchlib/src/vespa/searchlib/btree/btreenode.h b/searchlib/src/vespa/searchlib/btree/btreenode.h
index 7302b4d5203..0b1f1e8612a 100644
--- a/searchlib/src/vespa/searchlib/btree/btreenode.h
+++ b/searchlib/src/vespa/searchlib/btree/btreenode.h
@@ -17,7 +17,7 @@ template <typename, typename> class Allocator;
 template <typename> class BufferType;
 
 namespace allocator {
-template <typename, typename ...> class Assigner;
+template <typename, typename ...> struct Assigner;
 }
 
 }
@@ -292,7 +292,7 @@ public:
     template <typename, typename>
     friend class datastore::Allocator;
     template <typename, typename...>
-    friend class datastore::allocator::Assigner;
+    friend struct datastore::allocator::Assigner;
     typedef BTreeNode::Ref Ref;
     typedef datastore::Handle<InternalNodeType> RefPair;
     using ParentType::_keys;
@@ -401,7 +401,7 @@ public:
     template <typename, typename>
     friend class datastore::Allocator;
     template <typename, typename...>
-    friend class datastore::allocator::Assigner;
+    friend struct datastore::allocator::Assigner;
     typedef BTreeNode::Ref Ref;
     typedef datastore::Handle<LeafNodeType> RefPair;
     using ParentType::validSlots;
diff --git a/searchlib/src/vespa/searchlib/common/i_document_meta_store_context.h b/searchlib/src/vespa/searchlib/common/i_document_meta_store_context.h
index 7e2e3def0d2..8de10721b2e 100644
--- a/searchlib/src/vespa/searchlib/common/i_document_meta_store_context.h
+++ b/searchlib/src/vespa/searchlib/common/i_document_meta_store_context.h
@@ -6,7 +6,7 @@
 
 namespace search {
 
-class IDocumentMetaStore;
+struct IDocumentMetaStore;
 
 /**
  * API for providing read interface to the document meta store.
diff --git a/searchlib/src/vespa/searchlib/common/resultset.h b/searchlib/src/vespa/searchlib/common/resultset.h
index acffc1ff18e..c622c882ae6 100644
--- a/searchlib/src/vespa/searchlib/common/resultset.h
+++ b/searchlib/src/vespa/searchlib/common/resultset.h
@@ -5,7 +5,7 @@
 #include "rankedhit.h"
 #include <vespa/vespalib/util/array.h>
 
-class FastS_IResultSorter;
+struct FastS_IResultSorter;
 
 namespace search {
 
diff --git a/searchlib/src/vespa/searchlib/common/sequencedtaskexecutor.h b/searchlib/src/vespa/searchlib/common/sequencedtaskexecutor.h
index 41209da09ef..7551e82e489 100644
--- a/searchlib/src/vespa/searchlib/common/sequencedtaskexecutor.h
+++ b/searchlib/src/vespa/searchlib/common/sequencedtaskexecutor.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 namespace vespalib {
-    class ExecutorStats;
+    struct ExecutorStats;
     class BlockingThreadStackExecutor;
 }
 
diff --git a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
index d4827366619..33183f745ad 100644
--- a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
+++ b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
@@ -16,7 +16,7 @@ namespace vespalib { class nbostream; }
 
 namespace search {
 
-class CacheStats;
+struct CacheStats;
 
 class IDocumentStoreReadVisitor
 {
diff --git a/searchlib/src/vespa/searchlib/engine/transportserver.h b/searchlib/src/vespa/searchlib/engine/transportserver.h
index 67d373d5940..286b6a3ce01 100644
--- a/searchlib/src/vespa/searchlib/engine/transportserver.h
+++ b/searchlib/src/vespa/searchlib/engine/transportserver.h
@@ -57,7 +57,7 @@ private:
         }
     };
 
-    class Handler;
+    struct Handler;
 
     SearchServer           &_searchServer;
     DocsumServer           &_docsumServer;
diff --git a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
index ae1271edf5d..153d44ea720 100644
--- a/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
+++ b/searchlib/src/vespa/searchlib/features/dotproductfeature.cpp
@@ -347,8 +347,8 @@ ArrayParam<T>::ArrayParam(const Property & prop) {
 // Explicit instantiation since these are inspected by unit tests.
 // FIXME this feels a bit dirty, consider breaking up ArrayParam to remove dependencies
 // on templated vector parsing. This is why it's defined in this translation unit as it is.
-template class ArrayParam<int64_t>;
-template class ArrayParam<double>;
+template struct ArrayParam<int64_t>;
+template struct ArrayParam<double>;
 
 } // namespace dotproduct
 
diff --git a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
index b35d8972300..7cf3f4e140c 100644
--- a/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
+++ b/searchlib/src/vespa/searchlib/fef/iindexenvironment.h
@@ -4,7 +4,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 
-namespace vespalib::eval { class ConstantValue; }
+namespace vespalib::eval { struct ConstantValue; }
 
 namespace search::fef {
 
diff --git a/searchlib/src/vespa/searchlib/index/docbuilder.h b/searchlib/src/vespa/searchlib/index/docbuilder.h
index 73c60304f50..a9752cdb164 100644
--- a/searchlib/src/vespa/searchlib/index/docbuilder.h
+++ b/searchlib/src/vespa/searchlib/index/docbuilder.h
@@ -13,7 +13,7 @@
 #include <vespa/vespalib/util/exception.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
-namespace vespalib { namespace tensor { class Tensor; } }
+namespace vespalib { namespace tensor { struct Tensor; } }
 namespace search {
 namespace index {
 
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.h b/searchlib/src/vespa/searchlib/predicate/predicate_index.h
index e3caef2d22e..c0d855fa138 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_index.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.h
@@ -14,7 +14,7 @@
 
 namespace search::predicate {
 
-class PredicateTreeAnnotations;
+struct PredicateTreeAnnotations;
 
 /**
  * PredicateIndex keeps an index of boolean constraints for use with
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
index e90d4917a36..e0a4185f91b 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 namespace search::predicate {
-class Interval;
+struct Interval;
 
 /**
  * Stores interval entries in a memory-efficient way.
diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
index 4e38636f082..63d8e2cf558 100644
--- a/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
+++ b/searchlib/src/vespa/searchlib/predicate/predicate_tree_annotator.h
@@ -8,7 +8,7 @@
 #include <vector>
 #include <unordered_map>
 
-namespace vespalib::slime { class Inspector; }
+namespace vespalib::slime { struct Inspector; }
 
 namespace search::predicate {
 
diff --git a/searchlib/src/vespa/searchlib/query/tree/location.h b/searchlib/src/vespa/searchlib/query/tree/location.h
index 5ed717c87d6..e1826c7184a 100644
--- a/searchlib/src/vespa/searchlib/query/tree/location.h
+++ b/searchlib/src/vespa/searchlib/query/tree/location.h
@@ -6,8 +6,8 @@
 
 namespace vespalib { class asciistream; }
 namespace search::query {
-class Point;
-class Rectangle;
+struct Point;
+struct Rectangle;
 
 class Location {
     vespalib::string _location_string;
diff --git a/searchlib/src/vespa/searchlib/query/tree/node.h b/searchlib/src/vespa/searchlib/query/tree/node.h
index fe6f1b4b3b0..4ef0d3b6fc8 100644
--- a/searchlib/src/vespa/searchlib/query/tree/node.h
+++ b/searchlib/src/vespa/searchlib/query/tree/node.h
@@ -5,7 +5,7 @@
 
 namespace search::query {
 
-class QueryVisitor;
+struct QueryVisitor;
 
 /**
   This is the base of any node in the query tree. Both leaf nodes (terms)
diff --git a/searchlib/src/vespa/searchlib/queryeval/multisearch.h b/searchlib/src/vespa/searchlib/queryeval/multisearch.h
index d67f895ddb5..4b4cd101e5a 100644
--- a/searchlib/src/vespa/searchlib/queryeval/multisearch.h
+++ b/searchlib/src/vespa/searchlib/queryeval/multisearch.h
@@ -5,7 +5,7 @@
 #include "searchiterator.h"
 #include <vector>
 
-class MultiSearchRemoveTest;
+struct MultiSearchRemoveTest;
 
 namespace search::queryeval {
 
@@ -17,7 +17,7 @@ class MultiBitVectorIteratorBase;
  **/
 class MultiSearch : public SearchIterator
 {
-    friend class ::MultiSearchRemoveTest;
+    friend struct ::MultiSearchRemoveTest;
     friend class ::search::queryeval::MultiBitVectorIteratorBase;
 public:
     /**
diff --git a/searchlib/src/vespa/searchlib/tensor/i_tensor_attribute.h b/searchlib/src/vespa/searchlib/tensor/i_tensor_attribute.h
index 6c83d3caae9..e7b2c64e464 100644
--- a/searchlib/src/vespa/searchlib/tensor/i_tensor_attribute.h
+++ b/searchlib/src/vespa/searchlib/tensor/i_tensor_attribute.h
@@ -6,7 +6,7 @@
 
 namespace vespalib::tensor {
 class MutableDenseTensorView;
-class Tensor;
+struct Tensor;
 }
 namespace vespalib::eval { class ValueType; }
 
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_store.h b/searchlib/src/vespa/searchlib/tensor/tensor_store.h
index 43667158d89..6da1e341704 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.h
@@ -6,7 +6,7 @@
 #include <vespa/searchlib/datastore/datastore.h>
 #include <vespa/vespalib/util/generationhandler.h>
 
-namespace vespalib { namespace tensor { class Tensor; } }
+namespace vespalib { namespace tensor { struct Tensor; } }
 
 namespace search {