move to search::features namespace

3 files changed, 15 insertions, 13 deletions

diff --git a/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h b/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h
index 890d806893a..bff385457c0 100644
--- a/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h
+++ b/searchlib/src/vespa/searchlib/features/dense_tensor_attribute_executor.h
@@ -17,7 +17,7 @@ class DenseTensorAttributeExecutor : public fef::FeatureExecutor
 {
 private:
     const search::tensor::ITensorAttribute& _attribute;
-    vespalib::eval::MutableDenseTensorView _tensorView;
+    MutableDenseTensorView _tensorView;
 
 public:
     DenseTensorAttributeExecutor(const search::tensor::ITensorAttribute& attribute);
diff --git a/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.cpp b/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.cpp
index 913a386418b..0007bf81d30 100644
--- a/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.cpp
+++ b/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.cpp
@@ -2,9 +2,9 @@
 
 #include "mutable_dense_tensor_view.h"
 
-namespace vespalib::eval {
+namespace search::features {
 
-MutableDenseTensorView::MutableDenseTensorView(const ValueType &type_in)
+MutableDenseTensorView::MutableDenseTensorView(const vespalib::eval::ValueType &type_in)
   : _type(type_in),
     _cells()
 {
diff --git a/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.h b/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.h
index 6b1011033a0..acbc6565583 100644
--- a/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.h
+++ b/searchlib/src/vespa/searchlib/features/mutable_dense_tensor_view.h
@@ -5,25 +5,27 @@
 #include <vespa/eval/eval/value.h>
 #include <cassert>
 
-namespace vespalib::eval {
+namespace search::features {
 
 /**
  * A dense tensor with a cells reference that can be modified.
  */
-class MutableDenseTensorView : public Value {
+class MutableDenseTensorView : public vespalib::eval::Value {
 private:
-    const ValueType _type;
-    TypedCells _cells;
+    const vespalib::eval::ValueType _type;
+    vespalib::eval::TypedCells _cells;
 public:
-    MutableDenseTensorView(const ValueType &type_in);
-    void setCells(TypedCells cells_in) {
+    MutableDenseTensorView(const vespalib::eval::ValueType &type_in);
+    void setCells(vespalib::eval::TypedCells cells_in) {
         assert(cells_in.type == _type.cell_type());
         _cells = cells_in;
     }
-    const ValueType &type() const final override { return _type; }
-    TypedCells cells() const final override { return _cells; }
-    const Index &index() const final override { return TrivialIndex::get(); }
-    MemoryUsage get_memory_usage() const final override { return self_memory_usage<MutableDenseTensorView>(); }
+    const vespalib::eval::ValueType &type() const final override { return _type; }
+    vespalib::eval::TypedCells cells() const final override { return _cells; }
+    const Index &index() const final override { return vespalib::eval::TrivialIndex::get(); }
+    vespalib::MemoryUsage get_memory_usage() const final override {
+        return vespalib::eval::self_memory_usage<MutableDenseTensorView>();
+    }
 };
 
 }