Unify on nested namespaces.

21 files changed, 54 insertions, 107 deletions

diff --git a/eval/src/vespa/eval/tensor/default_tensor.h b/eval/src/vespa/eval/tensor/default_tensor.h
index 202b482e300..456d3333295 100644
--- a/eval/src/vespa/eval/tensor/default_tensor.h
+++ b/eval/src/vespa/eval/tensor/default_tensor.h
@@ -5,13 +5,11 @@
 #include "sparse/sparse_tensor.h"
 #include "sparse/sparse_tensor_builder.h"
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 struct DefaultTensor {
     using type = SparseTensor;
     using builder = SparseTensorBuilder;
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
index 554953288e1..5a16511fe71 100644
--- a/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
+++ b/eval/src/vespa/eval/tensor/default_tensor_engine.cpp
@@ -26,8 +26,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".eval.tensor.default_tensor_engine");
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 using eval::Aggr;
 using eval::Aggregator;
@@ -390,5 +389,4 @@ DefaultTensorEngine::rename(const Value &a, const std::vector<vespalib::string>
 
 //-----------------------------------------------------------------------------
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/default_tensor_engine.h b/eval/src/vespa/eval/tensor/default_tensor_engine.h
index 755bdcf6a9d..b7a9e4d43e7 100644
--- a/eval/src/vespa/eval/tensor/default_tensor_engine.h
+++ b/eval/src/vespa/eval/tensor/default_tensor_engine.h
@@ -4,8 +4,7 @@
 
 #include <vespa/eval/eval/tensor_engine.h>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 /**
  * This is a tensor engine implementation wrapping the default tensor
@@ -34,5 +33,4 @@ public:
     const Value &rename(const Value &a, const std::vector<vespalib::string> &from, const std::vector<vespalib::string> &to, Stash &stash) const override;
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/join_tensors.h b/eval/src/vespa/eval/tensor/join_tensors.h
index 86e5913d8f5..271a6b0195d 100644
--- a/eval/src/vespa/eval/tensor/join_tensors.h
+++ b/eval/src/vespa/eval/tensor/join_tensors.h
@@ -5,8 +5,7 @@
 #include "tensor.h"
 #include "direct_tensor_builder.h"
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 /*
  * Join the cells of two tensors.
@@ -44,5 +43,4 @@ joinTensorsNegated(const TensorImplType &lhs,
     return builder.build();
 }
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
index feb811a92de..aa4fd702b33 100644
--- a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.cpp
@@ -7,8 +7,7 @@
 
 using vespalib::nbostream;
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 namespace {
 
@@ -60,10 +59,8 @@ DenseBinaryFormat::deserialize(nbostream &stream)
         stream >> cellValue;
         cells.emplace_back(cellValue);
     }
-    return std::make_unique<DenseTensor>(makeValueType(std::move(dimensions)),
-                                         std::move(cells));
+    return std::make_unique<DenseTensor>(makeValueType(std::move(dimensions)), std::move(cells));
 }
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
index 8019648ffcb..2f1a53ba567 100644
--- a/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/dense_binary_format.h
@@ -3,11 +3,9 @@
 #pragma once
 
 #include <memory>
-namespace vespalib {
+namespace vespalib { class nbostream; }
 
-class nbostream;
-
-namespace tensor {
+namespace vespalib::tensor {
 
 class DenseTensor;
 class DenseTensorView;
@@ -22,5 +20,4 @@ public:
     static std::unique_ptr<DenseTensor> deserialize(nbostream &stream);
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
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 7ae3957dc0f..ece3c2e4a07 100644
--- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.cpp
@@ -10,8 +10,7 @@
 #include <vespa/vespalib/data/slime/slime.h>
 #include <vespa/vespalib/data/memory.h>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 
 using slime::Inserter;
@@ -58,13 +57,10 @@ SlimeBinaryFormatSerializer::SlimeBinaryFormatSerializer(Inserter &inserter)
 }
 
 
-SlimeBinaryFormatSerializer::~SlimeBinaryFormatSerializer()
-{
-}
+SlimeBinaryFormatSerializer::~SlimeBinaryFormatSerializer() = default;
 
 void
-SlimeBinaryFormatSerializer::visit(const TensorAddress &address,
-                                     double value)
+SlimeBinaryFormatSerializer::visit(const TensorAddress &address, double value)
 {
     Cursor &cellCursor = _cells.addObject();
     writeTensorAddress(cellCursor, address);
@@ -101,5 +97,4 @@ SlimeBinaryFormat::serialize(const Tensor &tensor)
 }
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
index f1366c64e2c..c9e9ff2c3e9 100644
--- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h
@@ -4,13 +4,11 @@
 
 #include <memory>
 
-namespace vespalib {
+namespace vespalib { class Slime; }
 
-class Slime;
+namespace vespalib::slime { struct Inserter; }
 
-namespace slime { struct Inserter; }
-
-namespace tensor {
+namespace vespalib::tensor {
 
 class Tensor;
 class TensorBuilder;
@@ -25,5 +23,4 @@ public:
     static std::unique_ptr<Slime> serialize(const Tensor &tensor);
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
index bd0c5b25f93..79d1aaa83a8 100644
--- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.cpp
@@ -11,8 +11,7 @@
 
 using vespalib::nbostream;
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 namespace {
 
@@ -59,13 +58,10 @@ SparseBinaryFormatSerializer::SparseBinaryFormatSerializer()
 }
 
 
-SparseBinaryFormatSerializer::~SparseBinaryFormatSerializer()
-{
-}
+SparseBinaryFormatSerializer::~SparseBinaryFormatSerializer() = default;
 
 void
-SparseBinaryFormatSerializer::visit(const TensorAddress &address,
-                                     double value)
+SparseBinaryFormatSerializer::visit(const TensorAddress &address, double value)
 {
     ++_numCells;
     writeTensorAddress(_cells, _type, address);
@@ -74,8 +70,7 @@ SparseBinaryFormatSerializer::visit(const TensorAddress &address,
 
 
 void
-SparseBinaryFormatSerializer::serialize(nbostream &stream,
-                                         const Tensor &tensor)
+SparseBinaryFormatSerializer::serialize(nbostream &stream, const Tensor &tensor)
 {
     _type = tensor.type();
     tensor.accept(*this);
@@ -121,5 +116,4 @@ SparseBinaryFormat::deserialize(nbostream &stream, TensorBuilder &builder)
 }
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
index db05574dfce..89f6947ad43 100644
--- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h
@@ -2,11 +2,9 @@
 
 #pragma once
 
-namespace vespalib {
+namespace vespalib { class nbostream; }
 
-class nbostream;
-
-namespace tensor {
+namespace vespalib::tensor {
 
 class Tensor;
 class TensorBuilder;
@@ -21,5 +19,4 @@ public:
     static void deserialize(nbostream &stream, TensorBuilder &builder);
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
index fe35ce4c831..eb57910a333 100644
--- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
+++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.cpp
@@ -15,8 +15,7 @@ LOG_SETUP(".eval.tensor.serialization.typed_binary_format");
 
 using vespalib::nbostream;
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 
 void
@@ -55,5 +54,4 @@ TypedBinaryFormat::deserialize(nbostream &stream)
 }
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
index c655210907f..334cbe5f564 100644
--- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
+++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h
@@ -5,11 +5,9 @@
 #include <memory>
 #include <cstdint>
 
-namespace vespalib {
+namespace vespalib { class nbostream; }
 
-class nbostream;
-
-namespace tensor {
+namespace vespalib::tensor {
 
 class Tensor;
 class TensorBuilder;
@@ -27,5 +25,4 @@ public:
     static std::unique_ptr<Tensor> deserialize(nbostream &stream);
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor.cpp b/eval/src/vespa/eval/tensor/tensor.cpp
index 8715a864f68..51c94aab5b0 100644
--- a/eval/src/vespa/eval/tensor/tensor.cpp
+++ b/eval/src/vespa/eval/tensor/tensor.cpp
@@ -4,8 +4,7 @@
 #include "default_tensor_engine.h"
 #include <sstream>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 Tensor::Tensor()
     : eval::Tensor(DefaultTensorEngine::ref())
@@ -34,5 +33,4 @@ operator<<(std::ostream &out, const Tensor &value)
     return out;
 }
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h
index 4061ed9c115..edf5fa710e3 100644
--- a/eval/src/vespa/eval/tensor/tensor.h
+++ b/eval/src/vespa/eval/tensor/tensor.h
@@ -9,9 +9,8 @@
 #include <vespa/eval/eval/tensor_spec.h>
 #include <vespa/eval/eval/value_type.h>
 
-namespace vespalib {
-namespace eval { struct BinaryOperation; }
-namespace tensor {
+namespace vespalib::eval { struct BinaryOperation; }
+namespace vespalib::tensor {
 
 class TensorVisitor;
 class CellValues;
@@ -66,5 +65,4 @@ public:
 
 std::ostream &operator<<(std::ostream &out, const Tensor &value);
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor_address.cpp b/eval/src/vespa/eval/tensor/tensor_address.cpp
index afadcf2c668..a68fc5d3353 100644
--- a/eval/src/vespa/eval/tensor/tensor_address.cpp
+++ b/eval/src/vespa/eval/tensor/tensor_address.cpp
@@ -4,19 +4,18 @@
 #include <algorithm>
 #include <ostream>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 const vespalib::string TensorAddress::Element::UNDEFINED_LABEL = "(undefined)";
 
-TensorAddress::Element::~Element() {}
+TensorAddress::Element::~Element() = default;
 
 TensorAddress::TensorAddress()
     : _elements()
 {
 }
 
-TensorAddress::~TensorAddress() {}
+TensorAddress::~TensorAddress() = default;
 
 TensorAddress::TensorAddress(const Elements &elements_in)
     : _elements(elements_in)
@@ -87,5 +86,4 @@ operator<<(std::ostream &out, const TensorAddress &value)
     return out;
 }
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor_address_element_iterator.h b/eval/src/vespa/eval/tensor/tensor_address_element_iterator.h
index e413712362f..01710105840 100644
--- a/eval/src/vespa/eval/tensor/tensor_address_element_iterator.h
+++ b/eval/src/vespa/eval/tensor/tensor_address_element_iterator.h
@@ -2,11 +2,10 @@
 
 #pragma once
 
-#include <vespa/vespalib/stllike/hash_set.h>
+#include <vespa/vespalib/stllike/string.h>
 
 namespace vespalib::tensor {
 
-using DimensionsSet = vespalib::hash_set<vespalib::stringref>;
 
 /**
  * An iterator for tensor address elements used to simplify 3-way merge
diff --git a/eval/src/vespa/eval/tensor/tensor_builder.h b/eval/src/vespa/eval/tensor/tensor_builder.h
index 05238b27df5..30eef5f9c54 100644
--- a/eval/src/vespa/eval/tensor/tensor_builder.h
+++ b/eval/src/vespa/eval/tensor/tensor_builder.h
@@ -4,8 +4,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 class Tensor;
 
@@ -30,5 +29,4 @@ public:
     virtual std::unique_ptr<Tensor> build() = 0;
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor_factory.cpp b/eval/src/vespa/eval/tensor/tensor_factory.cpp
index f88ae22c083..1e319a45a02 100644
--- a/eval/src/vespa/eval/tensor/tensor_factory.cpp
+++ b/eval/src/vespa/eval/tensor/tensor_factory.cpp
@@ -5,8 +5,7 @@
 #include "tensor_builder.h"
 #include <vespa/eval/tensor/dense/dense_tensor_builder.h>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 std::unique_ptr<Tensor>
 TensorFactory::create(const TensorCells &cells,
@@ -71,5 +70,4 @@ TensorFactory::createDense(const DenseTensorCells &cells)
 }
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor_factory.h b/eval/src/vespa/eval/tensor/tensor_factory.h
index 5fe31afc4dd..5884255fd59 100644
--- a/eval/src/vespa/eval/tensor/tensor_factory.h
+++ b/eval/src/vespa/eval/tensor/tensor_factory.h
@@ -4,8 +4,7 @@
 
 #include "types.h"
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 
 class Tensor;
@@ -26,5 +25,4 @@ public:
     createDense(const DenseTensorCells &cells);
 };
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}
diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.cpp b/eval/src/vespa/eval/tensor/tensor_mapper.cpp
index c91237e4994..dbf1965d441 100644
--- a/eval/src/vespa/eval/tensor/tensor_mapper.cpp
+++ b/eval/src/vespa/eval/tensor/tensor_mapper.cpp
@@ -53,9 +53,7 @@ SparseTensorMapper(const ValueType &type)
 }
 
 template <class TensorT>
-SparseTensorMapper<TensorT>::~SparseTensorMapper()
-{
-}
+SparseTensorMapper<TensorT>::~SparseTensorMapper() = default;
 
 template <class TensorT>
 std::unique_ptr<Tensor>
diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.h b/eval/src/vespa/eval/tensor/tensor_mapper.h
index 99994bd15e8..95c6cce8fc6 100644
--- a/eval/src/vespa/eval/tensor/tensor_mapper.h
+++ b/eval/src/vespa/eval/tensor/tensor_mapper.h
@@ -4,8 +4,7 @@
 
 #include <vespa/eval/eval/value_type.h>
 
-namespace vespalib {
-namespace tensor {
+namespace vespalib::tensor {
 
 class Tensor;
 
@@ -42,5 +41,4 @@ public:
 };
 
 
-} // namespace vespalib::tensor
-} // namespace vespalib
+}