use an extra namespace

12 files changed, 12 insertions, 11 deletions

diff --git a/eval/src/tests/tensor/packed_mappings/packed_mappings_test.cpp b/eval/src/tests/tensor/packed_mappings/packed_mappings_test.cpp
index 3c1c6a90521..87a77ab53ad 100644
--- a/eval/src/tests/tensor/packed_mappings/packed_mappings_test.cpp
+++ b/eval/src/tests/tensor/packed_mappings/packed_mappings_test.cpp
@@ -12,6 +12,7 @@
 #include <set>
 
 using namespace vespalib::eval;
+using namespace vespalib::eval::packed_mixed_tensor;
 
 namespace {
 
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_labels.cpp b/eval/src/vespa/eval/tensor/mixed/packed_labels.cpp
index 05986cbc562..2153a6a0ca9 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_labels.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_labels.cpp
@@ -3,7 +3,7 @@
 #include "packed_labels.h"
 #include <assert.h>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 int32_t
 PackedLabels::find_label(vespalib::stringref to_find) const
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_labels.h b/eval/src/vespa/eval/tensor/mixed/packed_labels.h
index e7fc1d8e33a..0994ef07a63 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_labels.h
+++ b/eval/src/vespa/eval/tensor/mixed/packed_labels.h
@@ -5,7 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vespa/vespalib/util/arrayref.h>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /**
  *  Stores labels for sparse (mapped) tensor dimensions,
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mappings.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mappings.cpp
index bb9fe1ceef8..03080772989 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mappings.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mappings.cpp
@@ -3,7 +3,7 @@
 #include "packed_mappings.h"
 #include <assert.h>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 
 int32_t
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mappings.h b/eval/src/vespa/eval/tensor/mixed/packed_mappings.h
index 44ab136f8bd..3ed554594aa 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mappings.h
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mappings.h
@@ -5,7 +5,7 @@
 #include "packed_labels.h"
 #include <vector>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /**
  *  Mappings for sparse tensor dimensions.
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp
index f7c3ffe4ed4..b06f826a3e3 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.cpp
@@ -3,7 +3,7 @@
 #include "packed_mappings_builder.h"
 #include <assert.h>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 PackedMappingsBuilder::~PackedMappingsBuilder() = default;
 
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.h b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.h
index 46bed473d06..ce3abb78280 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.h
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mappings_builder.h
@@ -9,7 +9,7 @@
 #include <set>
 #include <vector>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /**
  *  Builder for PackedMappings.
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.cpp
index cd0310762d2..1540958fa27 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.cpp
@@ -2,7 +2,7 @@
 
 #include "packed_mixed_builder.h"
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 template <typename T>
 ArrayRef<T> 
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.h b/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.h
index ea8a6206244..099f531ae38 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.h
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_builder.h
@@ -4,7 +4,7 @@
 
 #include "packed_mixed_tensor.h"
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /**
  * A builder for PackedMixedTensor objects
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_factory.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mixed_factory.cpp
index 2a29cab9ce0..75e6b1e996e 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_factory.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_factory.cpp
@@ -14,7 +14,7 @@ struct CreatePackedMixedBuilder {
     static std::unique_ptr<ValueBuilderBase> invoke(const ValueType &type, Args &&...args)
     {
         assert(check_cell_type<T>(type.cell_type()));
-        return std::make_unique<PackedMixedBuilder<T>>(type, std::forward<Args>(args)...);
+        return std::make_unique<packed_mixed_tensor::PackedMixedBuilder<T>>(type, std::forward<Args>(args)...);
     }
 };
 
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.cpp b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.cpp
index 0e32e1b06e7..b10f6586da5 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.cpp
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.cpp
@@ -2,7 +2,7 @@
 
 #include "packed_mixed_tensor.h"
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /*********************************************************************************/
 
diff --git a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.h b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.h
index 8956abafcd3..ffef379b37b 100644
--- a/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.h
+++ b/eval/src/vespa/eval/tensor/mixed/packed_mixed_tensor.h
@@ -9,7 +9,7 @@
 #include <vespa/eval/tensor/mixed/packed_mappings.h>
 #include <vespa/eval/tensor/mixed/packed_mappings_builder.h>
 
-namespace vespalib::eval {
+namespace vespalib::eval::packed_mixed_tensor {
 
 /**
  * An implementation of NewValue modeling a mixed tensor,