diff options
Diffstat (limited to 'eval/src')
3 files changed, 3 insertions, 5 deletions
diff --git a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp index 0a916ad871a..a6ef2f3fe5f 100644 --- a/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp +++ b/eval/src/tests/tensor/tensor_slime_serialization/tensor_slime_serialization_test.cpp @@ -32,7 +32,7 @@ struct Fixture const TensorDimensions &rhsDimensions) { Tensor::UP rhsTensor(createTensor(rhs, rhsDimensions)); auto slime = SlimeBinaryFormat::serialize(*rhsTensor); - vespalib::slime::Memory memory_exp(exp); + vespalib::Memory memory_exp(exp); vespalib::Slime expSlime; size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime); EXPECT_EQUAL(used, memory_exp.size); @@ -132,7 +132,7 @@ struct DenseFixture const DenseTensorCells &rhs) { Tensor::UP rhsTensor(createTensor(rhs)); auto slime = SlimeBinaryFormat::serialize(*rhsTensor); - vespalib::slime::Memory memory_exp(exp); + vespalib::Memory memory_exp(exp); vespalib::Slime expSlime; size_t used = vespalib::slime::JsonFormat::decode(memory_exp, expSlime); EXPECT_EQUAL(used, memory_exp.size); diff --git a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp index d04b7ae3c2b..37355406952 100644 --- a/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp +++ b/eval/src/vespa/eval/eval/value_cache/constant_tensor_loader.cpp @@ -15,7 +15,6 @@ LOG_SETUP(".vespalib.eval.value_cache.constant_tensor_loader"); namespace vespalib { namespace eval { -using Memory = slime::Memory; using Inspector = slime::Inspector; using ObjectTraverser = slime::ObjectTraverser; diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp index 16726038cf8..7bb1477e7a3 100644 --- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp +++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp @@ -9,7 +9,7 @@ #include <vespa/vespalib/data/slime/inserter.h> #include <vespa/vespalib/data/slime/cursor.h> #include <vespa/vespalib/data/slime/slime.h> - +#include <vespa/vespalib/data/memory.h> namespace vespalib { namespace tensor { @@ -19,7 +19,6 @@ using slime::Inserter; using slime::SlimeInserter; using slime::Cursor; using slime::ObjectInserter; -using slime::Memory; namespace { |