Use nested namespace

6 files changed, 12 insertions, 26 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
index 8c0fb945d8e..026cbc00604 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.cpp
@@ -18,8 +18,7 @@ using search::queryeval::SearchIterator;
 using search::queryeval::SimpleLeafBlueprint;
 using vespalib::GenerationHolder;
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 LidAllocator::LidAllocator(uint32_t size,
                            uint32_t capacity,
@@ -324,5 +323,4 @@ LidAllocator::getNumUsedLids() const
     return _usedLids.count();
 }
 
-} // namespace documentmetastore
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h
index bf8835f5c41..9d02195961c 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_allocator.h
@@ -13,8 +13,7 @@ class SingleValueBitNumericAttribute;
 class GrowStrategy;
 }
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 /**
  * Class responsible for allocating lids and managing
@@ -99,6 +98,4 @@ public:
 
 };
 
-} // namespace documentmetastore
-} // namespace proton
-
+}
diff --git a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
index 5c26b19f436..e6c9e9c0590 100644
--- a/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/attribute_weighted_set_blueprint.cpp
@@ -152,16 +152,14 @@ AttributeWeightedSetBlueprint::addToken(std::unique_ptr<ISearchContext> context,
 }
 
 queryeval::SearchIterator::UP
-AttributeWeightedSetBlueprint::createLeafSearch(const fef::TermFieldMatchDataArray &tfmda,
-                                                bool strict) const
+AttributeWeightedSetBlueprint::createLeafSearch(const fef::TermFieldMatchDataArray &tfmda, bool strict) const
 {
     assert(tfmda.size() == 1);
     fef::TermFieldMatchData &tfmd = *tfmda[0];
     if (strict) { // use generic weighted set search
         std::vector<queryeval::SearchIterator*> children(_contexts.size());
         for (size_t i = 0; i < _contexts.size(); ++i) {
-            children[i] = _contexts[i]->createIterator(&tfmd,
-                                                       true).release();
+            children[i] = _contexts[i]->createIterator(&tfmd, true).release();
         }
         return queryeval::SearchIterator::UP(queryeval::WeightedSetTermSearch::create(children, tfmd, _weights));
     } else { // use attribute filter optimization
diff --git a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.cpp b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.cpp
index 4b5fb6fce94..5c1b3df6f4e 100644
--- a/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.cpp
+++ b/searchlib/src/vespa/searchlib/fef/termfieldmatchdata.cpp
@@ -4,8 +4,7 @@
 #include "fieldinfo.h"
 #include <algorithm>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 TermFieldMatchData::TermFieldMatchData() :
     _docId(invalidId()),
@@ -114,5 +113,4 @@ TermFieldMatchData::appendPositionToAllocatedVector(const TermFieldMatchDataPosi
     }
 }
 
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/termfieldmatchdataarray.h b/searchlib/src/vespa/searchlib/fef/termfieldmatchdataarray.h
index 67db997a273..54ae3e850da 100644
--- a/searchlib/src/vespa/searchlib/fef/termfieldmatchdataarray.h
+++ b/searchlib/src/vespa/searchlib/fef/termfieldmatchdataarray.h
@@ -6,8 +6,7 @@
 #include <cassert>
 #include <cstddef>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 class TermFieldMatchData;
 
@@ -68,6 +67,4 @@ public:
     }
 };
 
-} // namespace fef
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/weighted_set_term_search.cpp b/searchlib/src/vespa/searchlib/queryeval/weighted_set_term_search.cpp
index 97725a00536..aae7c60bd80 100644
--- a/searchlib/src/vespa/searchlib/queryeval/weighted_set_term_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/weighted_set_term_search.cpp
@@ -9,8 +9,7 @@
 using search::fef::TermFieldMatchData;
 using vespalib::ObjectVisitor;
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 template <typename HEAP, typename IteratorPack>
 class WeightedSetTermSearchImpl : public WeightedSetTermSearch
@@ -164,5 +163,4 @@ WeightedSetTermSearch::create(search::fef::TermFieldMatchData &tmd,
 
 //-----------------------------------------------------------------------------
 
-}  // namespace search::queryeval
-}  // namespace search
+}