Merge pull request #13196 from vespa-engine/geirst/modern-cpp-1

Use nested namespaces.

28 files changed, 51 insertions, 102 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
index abd3829f5dd..f28633ffda7 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_aspect_delayer.h
@@ -5,19 +5,19 @@
 #include <memory>
 
 namespace document { class DocumentType; }
-namespace vespa { namespace config { namespace search { namespace internal {
+namespace vespa::config::search::internal {
 class InternalAttributesType;
 class InternalIndexschemaType;
 class InternalSummarymapType;
 class InternalSummaryType;
-} } } }
+}
 
 namespace proton {
 
 struct IDocumentTypeInspector;
 class IIndexschemaInspector;
 
-/*
+/**
  * Class to build adjusted attributes config and summary map config
  * to eliminate need for reprocessing when system is online.
  */
diff --git a/searchcore/src/vespa/searchcore/proton/common/doctypename.h b/searchcore/src/vespa/searchcore/proton/common/doctypename.h
index e96656d9510..661d54ab8d4 100644
--- a/searchcore/src/vespa/searchcore/proton/common/doctypename.h
+++ b/searchcore/src/vespa/searchcore/proton/common/doctypename.h
@@ -3,7 +3,7 @@
 
 #include <vespa/vespalib/stllike/string.h>
 
-namespace search { namespace engine { class Request; } }
+namespace search::engine { class Request; }
 namespace document { class DocumentType; }
 
 namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_versions.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_versions.h
index 8b593e52916..04c2d9bc55a 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_versions.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/document_meta_store_versions.h
@@ -2,11 +2,9 @@
 
 #pragma once
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 constexpr uint32_t NO_DOCUMENT_SIZE_TRACKING_VERSION = 0u;
 constexpr uint32_t DOCUMENT_SIZE_TRACKING_VERSION = 1u;
 
-}  // namespace proton::documentmetastore
-}  // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h
index 8c5025929df..dd32abcab6e 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/gid_compare.h
@@ -4,8 +4,7 @@
 
 #include <vespa/document/base/globalid.h>
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 /**
  * Interface for comparing global document ids for ordering.
@@ -44,6 +43,5 @@ public:
 };
 
 
-} // namespace documentmetastore
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.h
index a081fc9a670..5cd33475a31 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_gid_key_comparator.h
@@ -8,8 +8,7 @@
 #include <vespa/searchlib/common/idocumentmetastore.h>
 #include <vespa/vespalib/util/rcuvector.h>
 
-namespace proton {
-namespace documentmetastore {
+namespace proton::documentmetastore {
 
 /**
  * Comparator class used by the lid<->gid btree to get the lids
@@ -55,6 +54,5 @@ public:
 
 };
 
-} // namespace documentmetastore
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/i_tls_stats_factory.h b/searchcore/src/vespa/searchcore/proton/flushengine/i_tls_stats_factory.h
index f1339b7d6b0..f725332776e 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/i_tls_stats_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/i_tls_stats_factory.h
@@ -3,12 +3,11 @@
 
 #include "tls_stats.h"
 
-namespace proton {
-namespace flushengine {
+namespace proton::flushengine {
 
 class TlsStatsMap;
 
-/*
+/**
  * Class used to create statistics for a transaction log server over
  * multiple domains.
  */
@@ -18,5 +17,4 @@ public:
     virtual TlsStatsMap create() = 0;
 };
 
-} // namespace proton::flushengine
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp
index 2dd3a6aba56..9eddb342253 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_factory.cpp
@@ -7,8 +7,7 @@
 using search::transactionlog::DomainInfo;
 using search::transactionlog::DomainStats;
 
-namespace proton {
-namespace flushengine {
+namespace proton::flushengine {
 
 TlsStatsFactory::TlsStatsFactory(TransLogServer::SP tls)
     : _tls(tls)
@@ -34,5 +33,4 @@ TlsStatsFactory::create()
     return TlsStatsMap(std::move(map));
 }
 
-} // namespace proton::flushengine
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.cpp b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.cpp
index c9ba495aa82..5a2c5370eb0 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.cpp
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.cpp
@@ -5,8 +5,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.flushengine.tls_stats_map");
 
-namespace proton {
-namespace flushengine {
+namespace proton::flushengine {
 
 TlsStatsMap::TlsStatsMap(Map &&map)
     : _map(std::move(map))
@@ -24,6 +23,5 @@ TlsStatsMap::getTlsStats(const vespalib::string &domain) const {
 }
 
 }
-}
 
 VESPALIB_HASH_MAP_INSTANTIATE(vespalib::string, proton::flushengine::TlsStats);
diff --git a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.h b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.h
index cd3a17da53a..25aebe3f7bc 100644
--- a/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.h
+++ b/searchcore/src/vespa/searchcore/proton/flushengine/tls_stats_map.h
@@ -4,10 +4,9 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include "tls_stats.h"
 
-namespace proton {
-namespace flushengine {
+namespace proton::flushengine {
 
-/*
+/**
  * Class representing statistics for a transaction log server over multiple
  * domains.
  */
@@ -25,5 +24,4 @@ public:
     const TlsStats &getTlsStats(const vespalib::string &domain) const;
 };
 
-} // namespace proton::flushengine
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp
index bdfa4013c86..5fd164428e7 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.cpp
@@ -4,8 +4,7 @@
 
 using vespalib::eval::ConstantValue;
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 ConstantValueRepo::ConstantValueRepo(const ConstantValueFactory &factory)
     : _factory(factory),
@@ -30,4 +29,3 @@ ConstantValueRepo::getConstant(const vespalib::string &name) const
 }
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h
index 68660a93a48..f69e7672c74 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/constant_value_repo.h
@@ -6,8 +6,7 @@
 #include "ranking_constants.h"
 #include <vespa/eval/eval/value_cache/constant_value.h>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * Class that provides access to a configured set of rank constant values.
@@ -29,4 +28,3 @@ public:
 };
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/document_scorer.h b/searchcore/src/vespa/searchcore/proton/matching/document_scorer.h
index e44922ea6d9..f29f70b2cfa 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/document_scorer.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/document_scorer.h
@@ -6,8 +6,7 @@
 #include <vespa/searchlib/queryeval/hitcollector.h>
 #include <vespa/searchlib/queryeval/searchiterator.h>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * Class used to calculate the rank score for a set of documents using
@@ -32,5 +31,4 @@ public:
     virtual search::feature_t score(uint32_t docId) override;
 };
 
-} // namespace proton::matching
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h b/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h
index 5ac4fd14802..d71ff82a4a0 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/i_constant_value_repo.h
@@ -4,8 +4,7 @@
 
 #include <vespa/eval/eval/value_cache/constant_value.h>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * Interface for retrieving a named constant rank value to be used by features in the rank framework.
@@ -17,4 +16,3 @@ struct IConstantValueRepo {
 };
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp
index 32ec459ea69..5d7afc7bab1 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.cpp
@@ -2,8 +2,6 @@
 
 #include "match_phase_limit_calculator.h"
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
-} // namespace proton::matching
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
index a0aefd150f5..a2f4d129010 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limit_calculator.h
@@ -7,8 +7,7 @@
 #include <vespa/searchlib/queryeval/searchiterator.h>
 #include <vespa/searchlib/queryeval/blueprint.h>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * This class is used for all calculations related to limiting the
@@ -48,5 +47,4 @@ public:
     }
 };
 
-} // namespace proton::matching
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
index 5f79c888130..4a63a088062 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.cpp
@@ -2,8 +2,7 @@
 
 #include "partial_result.h"
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 namespace {
 
@@ -128,5 +127,4 @@ PartialResult::merge(Source &rhs)
     }
 }
 
-} // namespace proton::matching
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
index f1a0cfcda70..5bcc8dafea2 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/partial_result.h
@@ -6,8 +6,7 @@
 #include <vespa/searchlib/common/rankedhit.h>
 #include <vector>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * The best hits from each match thread are put into a partial result
@@ -51,6 +50,5 @@ public:
     virtual void merge(Source &rhs) override;
 };
 
-} // namespace proton::matching
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp
index ad8d9f02477..bf22d7ab7cb 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.cpp
@@ -2,8 +2,7 @@
 
 #include "ranking_constants.h"
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 RankingConstants::Constant::Constant(const vespalib::string &name_in,
                                      const vespalib::string &type_in,
@@ -56,5 +55,4 @@ RankingConstants::getConstant(const vespalib::string &name) const
 }
 
 }
-}
 
diff --git a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
index b978bd0402c..14e9bf1e20e 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
+++ b/searchcore/src/vespa/searchcore/proton/matching/ranking_constants.h
@@ -6,8 +6,7 @@
 #include <map>
 #include <vector>
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 /**
  * Class representing a set of configured ranking constants, with name, type and file path (where constant is stored).
@@ -43,4 +42,3 @@ public:
 };
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
index 596cc7fce1e..c0007ae2bda 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/termdataextractor.cpp
@@ -9,8 +9,7 @@ using search::query::Node;
 using search::query::TemplateTermVisitor;
 using std::vector;
 
-namespace proton {
-namespace matching {
+namespace proton::matching {
 
 namespace {
 class TermDataExtractorVisitor
@@ -54,5 +53,4 @@ void TermDataExtractor::extractTerms(const Node &node,
     const_cast<Node &>(node).accept(visitor);
 }
 
-}  // namespace matching
-}  // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.h b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.h
index c0c597da90e..afcf8941b6a 100644
--- a/searchcore/src/vespa/searchcore/proton/server/tlssyncer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/tlssyncer.h
@@ -5,14 +5,13 @@
 #include "itlssyncer.h"
 
 namespace vespalib { class ThreadExecutor; }
-namespace search { namespace transactionlog { class SyncProxy; } }
+namespace search::transactionlog { class SyncProxy; }
 
-namespace proton
-{
+namespace proton {
 
 class IGetSerialNum;
 
-/*
+/**
  * Class for syncing transaction log server in a safe manner.  The
  * serial number is retrieved by running a task in the document db
  * master thread to ensure that it reflects changes performed to data
diff --git a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_context_observer.h b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_context_observer.h
index 2a6fa87be20..d9ea677c98b 100644
--- a/searchcore/src/vespa/searchcore/proton/test/document_meta_store_context_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/document_meta_store_context_observer.h
@@ -5,8 +5,7 @@
 #include "document_meta_store_observer.h"
 #include <vespa/searchcore/proton/documentmetastore/i_document_meta_store_context.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 struct DocumentMetaStoreContextObserver : public IDocumentMetaStoreContext
 {
@@ -31,6 +30,5 @@ struct DocumentMetaStoreContextObserver : public IDocumentMetaStoreContext
     void               constructFreeList()       override { return _context.constructFreeList(); }
 };
 
-} // namespace test
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/executor_observer.h b/searchcore/src/vespa/searchcore/proton/test/executor_observer.h
index f819b528e7b..adab6adc764 100644
--- a/searchcore/src/vespa/searchcore/proton/test/executor_observer.h
+++ b/searchcore/src/vespa/searchcore/proton/test/executor_observer.h
@@ -3,8 +3,7 @@
 
 #include <vespa/vespalib/util/executor.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 class ExecutorObserver : public vespalib::Executor
 {
@@ -27,7 +26,6 @@ public:
     }
 };
 
-} // namespace test
-} // namespace proton
+}
 
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h b/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h
index 1c3cb0719ac..882ba9941e7 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_document_db_reference.h
@@ -7,8 +7,7 @@
 namespace search::attribute { class ReadableAttributeVector; }
 namespace search { class IGidToLidMapperFactory; }
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 /**
  * Mock of the IDocumentDBReference interface used for unit testing.
@@ -30,4 +29,3 @@ struct MockDocumentDBReference : public IDocumentDBReference {
 };
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
index c1c2e2909d9..169cc8e4f7a 100644
--- a/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
+++ b/searchcore/src/vespa/searchcore/proton/test/mock_gid_to_lid_change_handler.h
@@ -6,8 +6,7 @@
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 /*
  * Mockup of gid to lid change handler, used by unit tests to track
@@ -62,4 +61,3 @@ public:
 };
 
 }
-}
diff --git a/searchcore/src/vespa/searchcore/proton/test/simple_job_tracker.h b/searchcore/src/vespa/searchcore/proton/test/simple_job_tracker.h
index 648ca0aa8ad..cf4decf0f4a 100644
--- a/searchcore/src/vespa/searchcore/proton/test/simple_job_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/test/simple_job_tracker.h
@@ -4,8 +4,7 @@
 #include <vespa/searchcore/proton/metrics/i_job_tracker.h>
 #include <vespa/vespalib/util/count_down_latch.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 struct SimpleJobTracker : public IJobTracker
 {
@@ -22,6 +21,5 @@ struct SimpleJobTracker : public IJobTracker
     void end() override { _ended.countDown(); }
 };
 
-} // namespace test
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/simple_thread_service.h b/searchcore/src/vespa/searchcore/proton/test/simple_thread_service.h
index ee7a9e442fb..69f10567209 100644
--- a/searchcore/src/vespa/searchcore/proton/test/simple_thread_service.h
+++ b/searchcore/src/vespa/searchcore/proton/test/simple_thread_service.h
@@ -3,8 +3,7 @@
 
 #include <vespa/searchcorespi/index/i_thread_service.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 /**
  * Implementation of IThreadService that overrides isCurrentThread() to true.
@@ -41,6 +40,5 @@ public:
     }
 };
 
-} // namespace test
-} // namespace proton
+}
 
diff --git a/searchcore/src/vespa/searchcore/proton/test/simple_threading_service.h b/searchcore/src/vespa/searchcore/proton/test/simple_threading_service.h
index 72cef1b5c52..5576c8bd672 100644
--- a/searchcore/src/vespa/searchcore/proton/test/simple_threading_service.h
+++ b/searchcore/src/vespa/searchcore/proton/test/simple_threading_service.h
@@ -4,8 +4,7 @@
 #include "simple_thread_service.h"
 #include <vespa/searchcorespi/index/ithreadingservice.h>
 
-namespace proton {
-namespace test {
+namespace proton::test {
 
 /**
  * Implementation of IThreadingService that overrides IThreadService::isCurrentThread() to true.
@@ -47,7 +46,6 @@ public:
     }
 };
 
-} // namespace test
-} // namespace proton
+}