make a sub-namespace for the mutable value

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 7dca4fb60e1..fc09d37f35a 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;
-    MutableDenseValueView _tensorView;
+    mutable_value::MutableDenseValueView _tensorView;
 
 public:
     DenseTensorAttributeExecutor(const search::tensor::ITensorAttribute& attribute);
diff --git a/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.cpp b/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.cpp
index 09592a06037..b0d669e8aaa 100644
--- a/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.cpp
+++ b/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.cpp
@@ -2,9 +2,9 @@
 
 #include "mutable_dense_value_view.h"
 
-namespace search::features {
+namespace search::features::mutable_value {
 
-MutableDenseValueView::MutableDenseValueView(const vespalib::eval::ValueType &type_in)
+MutableDenseValueView::MutableDenseValueView(const ValueType &type_in)
   : _type(type_in),
     _cells()
 {
diff --git a/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.h b/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.h
index 5610b246a65..d4e813ae927 100644
--- a/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.h
+++ b/searchlib/src/vespa/searchlib/features/mutable_dense_value_view.h
@@ -5,26 +5,28 @@
 #include <vespa/eval/eval/value.h>
 #include <cassert>
 
-namespace search::features {
+namespace search::features::mutable_value {
+
+using namespace vespalib::eval;
 
 /**
  * A dense tensor with a cells reference that can be modified.
  */
-class MutableDenseValueView : public vespalib::eval::Value {
+class MutableDenseValueView : public Value {
 private:
-    const vespalib::eval::ValueType _type;
-    vespalib::eval::TypedCells _cells;
+    const ValueType _type;
+    TypedCells _cells;
 public:
-    MutableDenseValueView(const vespalib::eval::ValueType &type_in);
-    void setCells(vespalib::eval::TypedCells cells_in) {
+    MutableDenseValueView(const ValueType &type_in);
+    void setCells(TypedCells cells_in) {
         assert(cells_in.type == _type.cell_type());
         _cells = cells_in;
     }
-    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(); }
+    const ValueType &type() const final override { return _type; }
+    TypedCells cells() const final override { return _cells; }
+    const Index &index() const final override { return TrivialIndex::get(); }
     vespalib::MemoryUsage get_memory_usage() const final override {
-        return vespalib::eval::self_memory_usage<MutableDenseValueView>();
+        return self_memory_usage<MutableDenseValueView>();
     }
 };