diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-18 00:51:30 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-12-18 00:51:30 +0100 |
commit | de0ebc32941fb8cbbe60dae3ce051201aec3285b (patch) | |
tree | e052bd444ddfbb8a9acfccccbb0b5ff272d96bbe /eval | |
parent | 3b6064d84a18d327abc7f203434555c744ab1e0a (diff) |
Use nested namespace.
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/vespa/eval/tensor/sparse/sparse_tensor.h | 33 | ||||
-rw-r--r-- | eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h | 6 | ||||
-rw-r--r-- | eval/src/vespa/eval/tensor/tensor_operation.h | 6 |
3 files changed, 17 insertions, 28 deletions
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h index c7c38f0a182..ef0827ce8ac 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor.h @@ -11,8 +11,7 @@ #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * A tensor implementation using serialized tensor addresses to @@ -32,28 +31,22 @@ private: Stash _stash; public: - explicit SparseTensor(const eval::ValueType &type_in, - const Cells &cells_in); - SparseTensor(eval::ValueType &&type_in, - Cells &&cells_in, Stash &&stash_in); + explicit SparseTensor(const eval::ValueType &type_in, const Cells &cells_in); + SparseTensor(eval::ValueType &&type_in, Cells &&cells_in, Stash &&stash_in); const Cells &cells() const { return _cells; } const eval::ValueType &fast_type() const { return _type; } bool operator==(const SparseTensor &rhs) const; eval::ValueType combineDimensionsWith(const SparseTensor &rhs) const; - virtual const eval::ValueType &type() const override; - virtual double as_double() const override; - virtual Tensor::UP apply(const CellFunction &func) const override; - virtual Tensor::UP join(join_fun_t function, - const Tensor &arg) const override; - virtual Tensor::UP reduce(join_fun_t op, - const std::vector<vespalib::string> &dimensions) - const override; - virtual bool equals(const Tensor &arg) const override; - virtual Tensor::UP clone() const override; - virtual eval::TensorSpec toSpec() const override; - virtual void accept(TensorVisitor &visitor) const override; + const eval::ValueType &type() const override; + double as_double() const override; + Tensor::UP apply(const CellFunction &func) const override; + Tensor::UP join(join_fun_t function, const Tensor &arg) const override; + Tensor::UP reduce(join_fun_t op, const std::vector<vespalib::string> &dimensions) const override; + bool equals(const Tensor &arg) const override; + Tensor::UP clone() const override; + eval::TensorSpec toSpec() const override; + void accept(TensorVisitor &visitor) const override; }; -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h index d88386ec508..bb2c82a6d00 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_match.h @@ -4,8 +4,7 @@ #include <vespa/eval/tensor/tensor_operation.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * Returns the match product of two tensors. @@ -27,5 +26,4 @@ public: SparseTensorMatch(const TensorImplType &lhs, const TensorImplType &rhs); }; -} // namespace vespalib::tensor -} // namespace vespalib +} diff --git a/eval/src/vespa/eval/tensor/tensor_operation.h b/eval/src/vespa/eval/tensor/tensor_operation.h index 6975c21c448..827c16573d5 100644 --- a/eval/src/vespa/eval/tensor/tensor_operation.h +++ b/eval/src/vespa/eval/tensor/tensor_operation.h @@ -5,8 +5,7 @@ #include "direct_tensor_builder.h" #include <vespa/eval/tensor/sparse/direct_sparse_tensor_builder.h> -namespace vespalib { -namespace tensor { +namespace vespalib::tensor { /** * Base class for an operation over tensors. @@ -46,5 +45,4 @@ public: } }; -} // namespace vespalib::tensor -} // namespace vespalib +} |