diff options
author | Håvard Pettersen <havardpe@oath.com> | 2018-03-14 13:33:47 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2018-03-14 13:33:47 +0000 |
commit | 247183f20fcdf6f0069d0f3e526cdfc87970161e (patch) | |
tree | 304c4da28425ca53858e6d9d5007cac2a3eb4222 /eval/src | |
parent | b7e22c87c8d48f05d0201d1b2783b9d645c89779 (diff) |
use 'Super' when forwarding calls to visit_self
Diffstat (limited to 'eval/src')
6 files changed, 18 insertions, 9 deletions
diff --git a/eval/src/vespa/eval/eval/tensor_function.cpp b/eval/src/vespa/eval/eval/tensor_function.cpp index e99fefe91c1..3f79ac848ce 100644 --- a/eval/src/vespa/eval/eval/tensor_function.cpp +++ b/eval/src/vespa/eval/eval/tensor_function.cpp @@ -164,7 +164,7 @@ ConstValue::compile_self(Stash &) const void ConstValue::visit_self(vespalib::ObjectVisitor &visitor) const { - Leaf::visit_self(visitor); + Super::visit_self(visitor); if (result_type().is_double()) { visitor.visitFloat("value", _value.as_double()); } else { @@ -183,7 +183,7 @@ Inject::compile_self(Stash &) const void Inject::visit_self(vespalib::ObjectVisitor &visitor) const { - Leaf::visit_self(visitor); + Super::visit_self(visitor); visitor.visitInt("param_idx", _param_idx); } @@ -199,7 +199,7 @@ Reduce::compile_self(Stash &stash) const void Reduce::visit_self(vespalib::ObjectVisitor &visitor) const { - Op1::visit_self(visitor); + Super::visit_self(visitor); ::visit(visitor, "aggr", _aggr); ::visit(visitor, "dimensions", visit::DimList(_dimensions)); } @@ -218,7 +218,7 @@ Map::compile_self(Stash &) const void Map::visit_self(vespalib::ObjectVisitor &visitor) const { - Op1::visit_self(visitor); + Super::visit_self(visitor); ::visit(visitor, "function", _function); } @@ -242,7 +242,7 @@ Join::compile_self(Stash &) const void Join::visit_self(vespalib::ObjectVisitor &visitor) const { - Op2::visit_self(visitor); + Super::visit_self(visitor); ::visit(visitor, "function", _function); } @@ -257,7 +257,7 @@ Concat::compile_self(Stash &) const void Concat::visit_self(vespalib::ObjectVisitor &visitor) const { - Op2::visit_self(visitor); + Super::visit_self(visitor); visitor.visitString("dimension", _dimension); } @@ -273,7 +273,7 @@ Rename::compile_self(Stash &stash) const void Rename::visit_self(vespalib::ObjectVisitor &visitor) const { - Op1::visit_self(visitor); + Super::visit_self(visitor); ::visit(visitor, "from_to", visit::FromTo(_from, _to)); } diff --git a/eval/src/vespa/eval/eval/tensor_function.h b/eval/src/vespa/eval/eval/tensor_function.h index c19a5218467..a1d733e482b 100644 --- a/eval/src/vespa/eval/eval/tensor_function.h +++ b/eval/src/vespa/eval/eval/tensor_function.h @@ -167,6 +167,7 @@ public: class ConstValue : public Leaf { + using Super = Leaf; private: const Value &_value; public: @@ -180,6 +181,7 @@ public: class Inject : public Leaf { + using Super = Leaf; private: size_t _param_idx; public: @@ -195,6 +197,7 @@ public: class Reduce : public Op1 { + using Super = Op1; private: Aggr _aggr; std::vector<vespalib::string> _dimensions; @@ -215,6 +218,7 @@ public: class Map : public Op1 { + using Super = Op1; private: map_fun_t _function; public: @@ -232,6 +236,7 @@ public: class Join : public Op2 { + using Super = Op2; private: join_fun_t _function; public: @@ -250,6 +255,7 @@ public: class Concat : public Op2 { + using Super = Op2; private: vespalib::string _dimension; public: @@ -268,6 +274,7 @@ public: class Rename : public Op1 { + using Super = Op1; private: std::vector<vespalib::string> _from; std::vector<vespalib::string> _to; diff --git a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp index 70d1274421a..b3ed588a74a 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.cpp @@ -71,7 +71,7 @@ DenseInplaceJoinFunction::compile_self(Stash &) const void DenseInplaceJoinFunction::visit_self(vespalib::ObjectVisitor &visitor) const { - Join::visit_self(visitor); + Super::visit_self(visitor); visitor.visitBool("write_left", _write_left); } diff --git a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.h b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.h index d2bb56056c7..83acee6d31f 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_inplace_join_function.h @@ -11,6 +11,7 @@ namespace vespalib::tensor { **/ class DenseInplaceJoinFunction : public eval::tensor_function::Join { + using Super = eval::tensor_function::Join; public: using join_fun_t = ::vespalib::eval::tensor_function::join_fun_t; private: diff --git a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp index d68b7f07db0..c7cb16f37fd 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp +++ b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.cpp @@ -137,7 +137,7 @@ DenseXWProductFunction::compile_self(Stash &stash) const void DenseXWProductFunction::visit_self(vespalib::ObjectVisitor &visitor) const { - Op2::visit_self(visitor); + Super::visit_self(visitor); visitor.visitInt("vector_size", _vectorSize); visitor.visitInt("result_size", _resultSize); visitor.visitBool("common_dimension_innermost", _commonDimensionInnermost); diff --git a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h index 783516916c2..a8ccdd331cf 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h +++ b/eval/src/vespa/eval/tensor/dense/dense_xw_product_function.h @@ -16,6 +16,7 @@ using XWOutput = ArrayRef<double>; */ class DenseXWProductFunction : public eval::tensor_function::Op2 { + using Super = eval::tensor_function::Op2; public: struct Self { const eval::ValueType _resultType; |