Use nested namespace.

11 files changed, 23 insertions, 60 deletions

diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
index ec8fab1991b..524ad9b0fff 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/compact_document_words_store.cpp
@@ -7,8 +7,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".memoryindex.compact_document_words_store");
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 typedef CompactDocumentWordsStore::Builder Builder;
 
@@ -173,6 +172,5 @@ CompactDocumentWordsStore::getMemoryUsage() const
 
 }
 
-} // namespace memoryindex
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/dictionary.cpp b/searchlib/src/vespa/searchlib/memoryindex/dictionary.cpp
index accf227b96c..028f2b564d7 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/dictionary.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/dictionary.cpp
@@ -62,6 +62,5 @@ Dictionary::getMemoryUsage() const
 }
 
 
-} // namespace search::memoryindex
-
-} // namespace search
+}
+}
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
index 6ab17d5c524..903d6e4e822 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_remover.cpp
@@ -4,8 +4,7 @@
 #include "wordstore.h"
 #include <vespa/searchlib/common/sort.h>
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 typedef CompactDocumentWordsStore::Builder Builder;
 typedef CompactDocumentWordsStore::Iterator Iterator;
@@ -62,5 +61,4 @@ DocumentRemover::flush()
 }
 
 
-} // namespace memoryindex
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
index dbd5bf5d472..5d44a666ff9 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_remover.h
@@ -4,8 +4,7 @@
 #include "compact_document_words_store.h"
 #include "i_document_insert_listener.h"
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 class IDocumentRemoveListener;
 class WordStore;
@@ -59,6 +58,5 @@ public:
     void flush() override;
 };
 
-} // namespace memoryindex
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
index 78f33b9fae8..996193d93b2 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.cpp
@@ -21,9 +21,7 @@
 #include <vespa/document/annotation/spantree.h>
 #include <vespa/document/annotation/spantreevisitor.h>
 
-namespace search {
-
-namespace memoryindex {
+namespace search::memoryindex {
 
 using document::AlternateSpanList;
 using document::Annotation;
@@ -569,7 +567,5 @@ FieldInverter::pushDocuments(IOrderedDocumentInserter &inserter)
 }
 
 
-} // namespace memoryindex
-
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
index 96108a50f77..267f42eef80 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/fieldinverter.h
@@ -13,11 +13,7 @@
 #include <vespa/searchlib/bitcompression/posocccompression.h>
 #include <vespa/document/annotation/span.h>
 
-namespace search
-{
-
-namespace memoryindex
-{
+namespace search::memoryindex {
 
 class IOrderedDocumentInserter;
 class DocumentRemover;
@@ -442,7 +438,5 @@ public:
     }
 };
 
-} // namespace memoryindex
-
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h b/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h
index a37f87aed97..194a98ef8ba 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/i_document_insert_listener.h
@@ -2,8 +2,7 @@
 #pragma once
 #include <vespa/searchlib/datastore/entryref.h>
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 /**
  * Interface used to track which {wordRef, fieldId} pairs that are
@@ -17,7 +16,5 @@ public:
     virtual void flush() = 0;
 };
 
-
-} // namespace memoryindex
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp
index 1f55aa466b1..dd940c2d2d3 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.cpp
@@ -10,8 +10,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".searchlib.memoryindex.postingiterator");
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 PostingIterator::PostingIterator(Dictionary::PostingList::ConstIterator itr,
                                  const FeatureStore & featureStore,
@@ -69,7 +68,5 @@ PostingIterator::doUnpack(uint32_t docId)
     setUnpacked();
 }
 
-
-} // namespace search::memoryindex
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h
index 4960a3f299b..52b63b214f6 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/postingiterator.h
@@ -5,8 +5,7 @@
 #include "dictionary.h"
 #include <vespa/searchlib/queryeval/iterators.h>
 
-namespace search {
-namespace memoryindex {
+namespace search::memoryindex {
 
 /**
  * Search iterator for memory index posting list.
@@ -39,6 +38,5 @@ public:
     Trinary is_strict() const override { return Trinary::True; }
 };
 
-} // namespace search::memoryindex
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
index be216f7c2ba..9356889a70e 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
@@ -16,9 +16,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".memoryindex.urlfieldinverter");
 
-namespace search {
-
-namespace memoryindex {
+namespace search::memoryindex {
 
 namespace {
 
@@ -46,8 +44,7 @@ lowercaseToken(vespalib::string &dest, const char *src, size_t srcSize)
     return dest.size();
 }
 
-
-}  // namespace
+}
 
 
 using document::ArrayFieldValue;
@@ -394,7 +391,5 @@ UrlFieldInverter::UrlFieldInverter(index::Schema::CollectionType collectionType,
 }
 
 
-} // namespace memoryindex
-
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h
index 74f96cd40c3..c902feaf5a6 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h
@@ -5,11 +5,7 @@
 #include <vespa/searchcommon/common/datatype.h>
 #include <vespa/document/fieldvalue/structfieldvalue.h>
 
-namespace search
-{
-
-namespace memoryindex
-{
+namespace search::memoryindex {
 
 class FieldInverter;
 
@@ -71,7 +67,4 @@ public:
     }
 };
 
-
-} // namespace memoryindex
-
-} // namespace search
+}