summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2016-06-23 12:23:34 +0200
committerGitHub <noreply@github.com>2016-06-23 12:23:34 +0200
commit19f7f0ea992bae78852c53b05af77417ea9e0013 (patch)
tree253eeffea4b829de94c87e56973e95c2e0336b9b /vespalib
parent6f2f32e179e8247d3b067c9ad60863bc671da923 (diff)
parent50e2dfeaa75f5a2c77aeac9a03c77ac04391db20 (diff)
Merge pull request #164 from yahoo/geirst/fix-creation-of-empty-tensors-in-attribute-and-query-features
Create empty tensor with correct tensor type in attribute and query f…
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/tensor/tensor_mapper.cpp2
-rw-r--r--vespalib/src/vespa/vespalib/tensor/tensor_mapper.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/vespalib/src/vespa/vespalib/tensor/tensor_mapper.cpp b/vespalib/src/vespa/vespalib/tensor/tensor_mapper.cpp
index 7ab9f56b5be..8f34beec535 100644
--- a/vespalib/src/vespa/vespalib/tensor/tensor_mapper.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/tensor_mapper.cpp
@@ -259,7 +259,7 @@ TensorMapper::mapToDense(const Tensor &tensor, const TensorType &type)
}
std::unique_ptr<Tensor>
-TensorMapper::map(const Tensor &tensor)
+TensorMapper::map(const Tensor &tensor) const
{
switch (_type.type()) {
case TensorType::Type::INVALID:
diff --git a/vespalib/src/vespa/vespalib/tensor/tensor_mapper.h b/vespalib/src/vespa/vespalib/tensor/tensor_mapper.h
index f6eb087bc60..36ce0426c69 100644
--- a/vespalib/src/vespa/vespalib/tensor/tensor_mapper.h
+++ b/vespalib/src/vespa/vespalib/tensor/tensor_mapper.h
@@ -35,7 +35,7 @@ public:
static std::unique_ptr<Tensor>
mapToDense(const Tensor &tensor, const TensorType &type);
- std::unique_ptr<Tensor> map(const Tensor &tensor);
+ std::unique_ptr<Tensor> map(const Tensor &tensor) const;
};