diff options
author | Håvard Pettersen <havardpe@oath.com> | 2017-11-28 14:34:45 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2017-11-28 14:34:45 +0000 |
commit | 4c6182ee90541283361c08b24d80f8aaf3d843c2 (patch) | |
tree | 25716b3abe272bae829180a527d8ffe66a2de538 /searchlib | |
parent | ccb37dd9a7bc4e6a42bb6084803517945d651d84 (diff) |
update external code (getType->type)
Diffstat (limited to 'searchlib')
3 files changed, 5 insertions, 5 deletions
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp index 8fc47725a1d..d041dde52a5 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp @@ -363,10 +363,10 @@ Fixture::testEmptyTensor() Tensor::UP emptyTensor = tensorAttr.getEmptyTensor(); if (_denseTensors) { vespalib::string expSpec = expEmptyDenseTensorSpec(); - EXPECT_EQUAL(emptyTensor->getType(), ValueType::from_spec(expSpec)); + EXPECT_EQUAL(emptyTensor->type(), ValueType::from_spec(expSpec)); } else { - EXPECT_EQUAL(emptyTensor->getType(), tensorAttr.getConfig().tensorType()); - EXPECT_EQUAL(emptyTensor->getType(), ValueType::from_spec(_typeSpec)); + EXPECT_EQUAL(emptyTensor->type(), tensorAttr.getConfig().tensorType()); + EXPECT_EQUAL(emptyTensor->type(), ValueType::from_spec(_typeSpec)); } } diff --git a/searchlib/src/tests/features/constant/constant_test.cpp b/searchlib/src/tests/features/constant/constant_test.cpp index 4a88fde58ce..f9d1736ba9e 100644 --- a/searchlib/src/tests/features/constant/constant_test.cpp +++ b/searchlib/src/tests/features/constant/constant_test.cpp @@ -76,7 +76,7 @@ struct ExecFixture const TensorDimensions &dimensions) { Tensor::UP tensor = createTensor(cells, dimensions); - ValueType type(tensor->getType()); + ValueType type(tensor->type()); test.getIndexEnv().addConstantValue(name, std::move(type), std::move(tensor)); diff --git a/searchlib/src/vespa/searchlib/features/queryfeature.cpp b/searchlib/src/vespa/searchlib/features/queryfeature.cpp index 271861d472c..3e52546e841 100644 --- a/searchlib/src/vespa/searchlib/features/queryfeature.cpp +++ b/searchlib/src/vespa/searchlib/features/queryfeature.cpp @@ -122,7 +122,7 @@ createTensorExecutor(const search::fef::IQueryEnvironment &env, const vespalib::string &value = prop.get(); vespalib::nbostream stream(value.data(), value.size()); vespalib::tensor::Tensor::UP tensor = vespalib::tensor::TypedBinaryFormat::deserialize(stream); - if (tensor->getType() != valueType) { + if (tensor->type() != valueType) { vespalib::tensor::TensorMapper mapper(valueType); vespalib::tensor::Tensor::UP mappedTensor = mapper.map(*tensor); tensor = std::move(mappedTensor); |