From 6b519c36d5fa6c614da2d940d38168858f96d236 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@broadpark.no>
Date: Fri, 1 Feb 2019 13:56:10 +0100
Subject: Adjust forward declarations in eval.

---
 eval/src/vespa/eval/eval/basic_nodes.h                          | 2 +-
 eval/src/vespa/eval/eval/compile_tensor_function.h              | 2 +-
 eval/src/vespa/eval/eval/gbdt.h                                 | 2 +-
 eval/src/vespa/eval/eval/interpreted_function.h                 | 6 +++---
 eval/src/vespa/eval/eval/make_tensor_function.h                 | 6 +++---
 eval/src/vespa/eval/eval/node_types.h                           | 2 +-
 eval/src/vespa/eval/eval/tensor.h                               | 2 +-
 eval/src/vespa/eval/eval/tensor_engine.h                        | 2 +-
 eval/src/vespa/eval/eval/tensor_spec.h                          | 4 ++--
 eval/src/vespa/eval/eval/visit_stuff.h                          | 2 +-
 eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h           | 2 +-
 eval/src/vespa/eval/tensor/serialization/slime_binary_format.h  | 4 ++--
 eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h | 2 +-
 eval/src/vespa/eval/tensor/serialization/typed_binary_format.h  | 2 +-
 eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h         | 2 +-
 eval/src/vespa/eval/tensor/tensor.h                             | 2 +-
 eval/src/vespa/eval/tensor/tensor_builder.h                     | 2 +-
 eval/src/vespa/eval/tensor/tensor_factory.h                     | 2 +-
 eval/src/vespa/eval/tensor/tensor_mapper.h                      | 2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'eval')

diff --git a/eval/src/vespa/eval/eval/basic_nodes.h b/eval/src/vespa/eval/eval/basic_nodes.h
index 95e6cdf34f7..6af0a04b31a 100644
--- a/eval/src/vespa/eval/eval/basic_nodes.h
+++ b/eval/src/vespa/eval/eval/basic_nodes.h
@@ -14,7 +14,7 @@
 
 namespace vespalib::eval {
 
-namespace nodes { class Node; }
+namespace nodes { struct Node; }
 
 struct NodeTraverser;
 struct NodeVisitor;
diff --git a/eval/src/vespa/eval/eval/compile_tensor_function.h b/eval/src/vespa/eval/eval/compile_tensor_function.h
index bfac0e0f036..013d228c2f9 100644
--- a/eval/src/vespa/eval/eval/compile_tensor_function.h
+++ b/eval/src/vespa/eval/eval/compile_tensor_function.h
@@ -9,7 +9,7 @@ namespace vespalib { class Stash; }
 
 namespace vespalib::eval {
 
-class TensorFunction;
+struct TensorFunction;
 
 std::vector<InterpretedFunction::Instruction> compile_tensor_function(const TensorFunction &function, Stash &stash);
 
diff --git a/eval/src/vespa/eval/eval/gbdt.h b/eval/src/vespa/eval/eval/gbdt.h
index 23d937604ca..378b6cc4b08 100644
--- a/eval/src/vespa/eval/eval/gbdt.h
+++ b/eval/src/vespa/eval/eval/gbdt.h
@@ -8,7 +8,7 @@
 namespace vespalib {
 namespace eval {
 
-namespace nodes { class Node; }
+namespace nodes { struct Node; }
 
 namespace gbdt {
 
diff --git a/eval/src/vespa/eval/eval/interpreted_function.h b/eval/src/vespa/eval/eval/interpreted_function.h
index a9b6082fa4e..dbe5345fc9b 100644
--- a/eval/src/vespa/eval/eval/interpreted_function.h
+++ b/eval/src/vespa/eval/eval/interpreted_function.h
@@ -10,9 +10,9 @@
 namespace vespalib {
 namespace eval {
 
-namespace nodes { class Node; }
-class TensorEngine;
-class TensorFunction;
+namespace nodes { struct Node; }
+struct TensorEngine;
+struct TensorFunction;
 class TensorSpec;
 
 /**
diff --git a/eval/src/vespa/eval/eval/make_tensor_function.h b/eval/src/vespa/eval/eval/make_tensor_function.h
index f9f415b9b9f..bf6a9a44f4a 100644
--- a/eval/src/vespa/eval/eval/make_tensor_function.h
+++ b/eval/src/vespa/eval/eval/make_tensor_function.h
@@ -6,11 +6,11 @@ namespace vespalib { class Stash; }
 
 namespace vespalib::eval {
 
-class TensorEngine;
+struct TensorEngine;
 class NodeTypes;
-class TensorFunction;
+struct TensorFunction;
 
-namespace nodes { class Node; }
+namespace nodes { struct Node; }
 
 const TensorFunction &make_tensor_function(const TensorEngine &engine, const nodes::Node &root, const NodeTypes &types, Stash &stash);
 
diff --git a/eval/src/vespa/eval/eval/node_types.h b/eval/src/vespa/eval/eval/node_types.h
index f8a13bfb2ac..0b049598f4c 100644
--- a/eval/src/vespa/eval/eval/node_types.h
+++ b/eval/src/vespa/eval/eval/node_types.h
@@ -8,7 +8,7 @@
 namespace vespalib {
 namespace eval {
 
-namespace nodes { class Node; }
+namespace nodes { struct Node; }
 class Function;
 
 /**
diff --git a/eval/src/vespa/eval/eval/tensor.h b/eval/src/vespa/eval/eval/tensor.h
index 149e2774bfb..ddc341ed910 100644
--- a/eval/src/vespa/eval/eval/tensor.h
+++ b/eval/src/vespa/eval/eval/tensor.h
@@ -8,7 +8,7 @@
 namespace vespalib {
 namespace eval {
 
-class TensorEngine;
+struct TensorEngine;
 
 /**
  * Base class for all tensors. Tensor operations are defined by the
diff --git a/eval/src/vespa/eval/eval/tensor_engine.h b/eval/src/vespa/eval/eval/tensor_engine.h
index a01a6f889fd..d9f6d35609a 100644
--- a/eval/src/vespa/eval/eval/tensor_engine.h
+++ b/eval/src/vespa/eval/eval/tensor_engine.h
@@ -17,7 +17,7 @@ class nbostream;
 
 namespace eval {
 
-class Value;
+struct Value;
 class Tensor;
 class TensorSpec;
 
diff --git a/eval/src/vespa/eval/eval/tensor_spec.h b/eval/src/vespa/eval/eval/tensor_spec.h
index 66feb02de40..25af4c7a93c 100644
--- a/eval/src/vespa/eval/eval/tensor_spec.h
+++ b/eval/src/vespa/eval/eval/tensor_spec.h
@@ -11,8 +11,8 @@ namespace vespalib {
 
 namespace slime {
 
-class Cursor;
-class Inspector;
+struct Cursor;
+struct Inspector;
 
 } // namespace vespalib::slime
 
diff --git a/eval/src/vespa/eval/eval/visit_stuff.h b/eval/src/vespa/eval/eval/visit_stuff.h
index cbbca9be056..ef21352535d 100644
--- a/eval/src/vespa/eval/eval/visit_stuff.h
+++ b/eval/src/vespa/eval/eval/visit_stuff.h
@@ -9,7 +9,7 @@ namespace vespalib {
 class ObjectVisitor;
 namespace eval {
 enum class Aggr;
-class TensorFunction;
+struct TensorFunction;
 namespace visit {
 using map_fun_t = double (*)(double);
 using join_fun_t = double (*)(double, double);
diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h
index 49e075f6999..52d49b8e95b 100644
--- a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h
+++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h
@@ -3,7 +3,7 @@
 #pragma once
 
 namespace vespalib::tensor {
-    class Tensor;
+    struct Tensor;
     class DenseTensor;
 }
 
diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
index e80cd063e30..b53a3af9e19 100644
--- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
@@ -8,11 +8,11 @@ namespace vespalib {
 
 class Slime;
 
-namespace slime { class Inserter; }
+namespace slime { struct Inserter; }
 
 namespace tensor {
 
-class Tensor;
+struct Tensor;
 class TensorBuilder;
 
 /**
diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
index db05574dfce..23d77a5c704 100644
--- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
@@ -8,7 +8,7 @@ class nbostream;
 
 namespace tensor {
 
-class Tensor;
+struct Tensor;
 class TensorBuilder;
 
 /**
diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
index c655210907f..38c3373213c 100644
--- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
@@ -11,7 +11,7 @@ class nbostream;
 
 namespace tensor {
 
-class Tensor;
+struct Tensor;
 class TensorBuilder;
 
 /**
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h
index ec6edf2d847..2c1c57de8ac 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h
@@ -3,7 +3,7 @@
 #pragma once
 
 namespace vespalib::tensor {
-    class Tensor;
+    struct Tensor;
     class SparseTensor;
 }
 
diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h
index 8e31448e026..4d4a40907fb 100644
--- a/eval/src/vespa/eval/tensor/tensor.h
+++ b/eval/src/vespa/eval/tensor/tensor.h
@@ -10,7 +10,7 @@
 #include <vespa/eval/eval/value_type.h>
 
 namespace vespalib {
-namespace eval { class BinaryOperation; }
+namespace eval { struct BinaryOperation; }
 namespace tensor {
 
 class TensorVisitor;
diff --git a/eval/src/vespa/eval/tensor/tensor_builder.h b/eval/src/vespa/eval/tensor/tensor_builder.h
index 05238b27df5..205da137895 100644
--- a/eval/src/vespa/eval/tensor/tensor_builder.h
+++ b/eval/src/vespa/eval/tensor/tensor_builder.h
@@ -7,7 +7,7 @@
 namespace vespalib {
 namespace tensor {
 
-class Tensor;
+struct Tensor;
 
 /**
  * An interfrace for builder of tensors (sparse multi-dimensional array).
diff --git a/eval/src/vespa/eval/tensor/tensor_factory.h b/eval/src/vespa/eval/tensor/tensor_factory.h
index 5fe31afc4dd..f3c9aae7328 100644
--- a/eval/src/vespa/eval/tensor/tensor_factory.h
+++ b/eval/src/vespa/eval/tensor/tensor_factory.h
@@ -8,7 +8,7 @@ namespace vespalib {
 namespace tensor {
 
 
-class Tensor;
+struct Tensor;
 class TensorBuilder;
 
 /**
diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.h b/eval/src/vespa/eval/tensor/tensor_mapper.h
index 99994bd15e8..6218146496a 100644
--- a/eval/src/vespa/eval/tensor/tensor_mapper.h
+++ b/eval/src/vespa/eval/tensor/tensor_mapper.h
@@ -7,7 +7,7 @@
 namespace vespalib {
 namespace tensor {
 
-class Tensor;
+struct Tensor;
 
 /**
  * Class to map a tensor to a given tensor type.  Dimensions in input
-- 
cgit v1.2.3