Nested namespaces

27 files changed, 88 insertions, 131 deletions

diff --git a/searchlib/src/vespa/searchlib/engine/docsumreply.cpp b/searchlib/src/vespa/searchlib/engine/docsumreply.cpp
index a139064d1eb..11c170296b7 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumreply.cpp
+++ b/searchlib/src/vespa/searchlib/engine/docsumreply.cpp
@@ -3,8 +3,7 @@
 #include "docsumreply.h"
 #include <vespa/vespalib/data/slime/slime.h>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 DocsumReply::DocsumReply() : DocsumReply(vespalib::Slime::UP(nullptr)) { }
 
@@ -15,5 +14,5 @@ DocsumReply::DocsumReply(vespalib::Slime::UP root)
 
 DocsumReply::~DocsumReply() { }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/docsumreply.h b/searchlib/src/vespa/searchlib/engine/docsumreply.h
index c445b412a26..37431030253 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumreply.h
+++ b/searchlib/src/vespa/searchlib/engine/docsumreply.h
@@ -9,8 +9,7 @@
 #include <vespa/searchlib/engine/docsumrequest.h>
 
 namespace vespalib { class Slime; }
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct DocsumReply
 {
@@ -44,5 +43,5 @@ struct DocsumReply
     ~DocsumReply();
 };
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
index 92eddb7f21f..b2a71b85890 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.cpp
@@ -3,8 +3,7 @@
 #include "docsumrequest.h"
 #include "packetconverter.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 DocsumRequest::DocsumRequest()
     : DocsumRequest(false) {}
@@ -25,7 +24,7 @@ DocsumRequest::DocsumRequest(const fastos::TimeStamp &start_time, bool useRootSl
 {
 }
 
-DocsumRequest::~DocsumRequest() {}
+DocsumRequest::~DocsumRequest() = default;
 
 void DocsumRequest::Source::lazyDecode() const
 {
@@ -43,5 +42,4 @@ DocsumRequest::Source::~Source() {
     }
 }
 
-} // namespace engine
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/engine/docsumrequest.h b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
index e2b724065b1..93961c80e79 100644
--- a/searchlib/src/vespa/searchlib/engine/docsumrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/docsumrequest.h
@@ -2,11 +2,11 @@
 
 #pragma once
 
-#include <vespa/document/base/globalid.h>
-#include <vespa/searchlib/common/hitrank.h>
 #include "propertiesmap.h"
 #include "request.h"
 #include "source_description.h"
+#include <vespa/document/base/globalid.h>
+#include <vespa/searchlib/common/hitrank.h>
 
 namespace search::fs4transport { class FS4Packet_GETDOCSUMSX; }
 
diff --git a/searchlib/src/vespa/searchlib/engine/errorcodes.cpp b/searchlib/src/vespa/searchlib/engine/errorcodes.cpp
index dd656fe1ef2..0182d85177a 100644
--- a/searchlib/src/vespa/searchlib/engine/errorcodes.cpp
+++ b/searchlib/src/vespa/searchlib/engine/errorcodes.cpp
@@ -2,8 +2,7 @@
 
 #include "errorcodes.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 const char *
 getStringFromErrorCode(ErrorCode ecode)
@@ -31,5 +30,5 @@ getStringFromErrorCode(ErrorCode ecode)
     return "Unknown error";
 }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/errorcodes.h b/searchlib/src/vespa/searchlib/engine/errorcodes.h
index 3b2357a1ebb..d0812ad9d6c 100644
--- a/searchlib/src/vespa/searchlib/engine/errorcodes.h
+++ b/searchlib/src/vespa/searchlib/engine/errorcodes.h
@@ -2,8 +2,7 @@
 
 #pragma once
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 /**
  * Enum defining global error codes.
@@ -31,6 +30,5 @@ enum ErrorCode {
  **/
 const char* getStringFromErrorCode(ErrorCode error);
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/monitorapi.h b/searchlib/src/vespa/searchlib/engine/monitorapi.h
index a0e184a4c04..ece52da74da 100644
--- a/searchlib/src/vespa/searchlib/engine/monitorapi.h
+++ b/searchlib/src/vespa/searchlib/engine/monitorapi.h
@@ -5,8 +5,7 @@
 #include "monitorrequest.h"
 #include "monitorreply.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 /**
  * A monitor client is the object being notified of the completion of
@@ -61,6 +60,5 @@ public:
     virtual ~MonitorServer() {}
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/monitorreply.cpp b/searchlib/src/vespa/searchlib/engine/monitorreply.cpp
index 77d1b31d071..46525244dc4 100644
--- a/searchlib/src/vespa/searchlib/engine/monitorreply.cpp
+++ b/searchlib/src/vespa/searchlib/engine/monitorreply.cpp
@@ -2,8 +2,7 @@
 
 #include "monitorreply.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 MonitorReply::MonitorReply()
     : mld(),
@@ -18,5 +17,5 @@ MonitorReply::MonitorReply()
       flags()
 { }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/monitorreply.h b/searchlib/src/vespa/searchlib/engine/monitorreply.h
index 12fb39b0944..600a855a4ec 100644
--- a/searchlib/src/vespa/searchlib/engine/monitorreply.h
+++ b/searchlib/src/vespa/searchlib/engine/monitorreply.h
@@ -2,12 +2,9 @@
 
 #pragma once
 
-#include <vespa/vespalib/stllike/string.h>
-#include <vector>
 #include <memory>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct MonitorReply
 {
@@ -27,5 +24,5 @@ struct MonitorReply
     MonitorReply();
 };
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/monitorrequest.cpp b/searchlib/src/vespa/searchlib/engine/monitorrequest.cpp
index 81074743ab5..1e5c2868cef 100644
--- a/searchlib/src/vespa/searchlib/engine/monitorrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/monitorrequest.cpp
@@ -2,13 +2,12 @@
 
 #include "monitorrequest.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 MonitorRequest::MonitorRequest()
     : reportActiveDocs(false), flags(0)
 {
 }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/monitorrequest.h b/searchlib/src/vespa/searchlib/engine/monitorrequest.h
index e9665ba1b1a..ac07e42a68a 100644
--- a/searchlib/src/vespa/searchlib/engine/monitorrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/monitorrequest.h
@@ -4,8 +4,7 @@
 
 #include <memory>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct MonitorRequest
 {
@@ -18,5 +17,5 @@ struct MonitorRequest
     MonitorRequest();
 };
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/packetconverter.cpp b/searchlib/src/vespa/searchlib/engine/packetconverter.cpp
index 21e13f7855c..0697c4631ba 100644
--- a/searchlib/src/vespa/searchlib/engine/packetconverter.cpp
+++ b/searchlib/src/vespa/searchlib/engine/packetconverter.cpp
@@ -27,8 +27,7 @@ struct FS4PropertiesBuilder : public search::fef::IPropertiesVisitor {
 
 } // namespace <unnamed>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 using namespace search::fs4transport;
 
@@ -259,5 +258,5 @@ PacketConverter::fromTraceReply(const TraceReply &reply, TRACEREPLY &packet)
     fillPacketProperties(reply.propertiesMap, packet._propsVector);
 }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/packetconverter.h b/searchlib/src/vespa/searchlib/engine/packetconverter.h
index e2f41a77e91..90fc27c8c97 100644
--- a/searchlib/src/vespa/searchlib/engine/packetconverter.h
+++ b/searchlib/src/vespa/searchlib/engine/packetconverter.h
@@ -2,7 +2,6 @@
 
 #pragma once
 
-#include <vespa/searchlib/common/packets.h>
 #include "searchrequest.h"
 #include "searchreply.h"
 #include "docsumrequest.h"
@@ -10,9 +9,9 @@
 #include "monitorrequest.h"
 #include "monitorreply.h"
 #include "tracereply.h"
+#include <vespa/searchlib/common/packets.h>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 
 /**
@@ -171,6 +170,5 @@ public:
     static void fromTraceReply(const TraceReply &reply, TRACEREPLY &packet);
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/propertiesmap.cpp b/searchlib/src/vespa/searchlib/engine/propertiesmap.cpp
index ca15294d5a4..f9045612849 100644
--- a/searchlib/src/vespa/searchlib/engine/propertiesmap.cpp
+++ b/searchlib/src/vespa/searchlib/engine/propertiesmap.cpp
@@ -3,10 +3,9 @@
 #include "propertiesmap.h"
 #include <vespa/vespalib/stllike/hash_map.hpp>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
-search::fef::Properties PropertiesMap::_emptyProperties;
+fef::Properties PropertiesMap::_emptyProperties;
 
 PropertiesMap::PropertiesMap()
     : _propertiesMap()
@@ -14,13 +13,13 @@ PropertiesMap::PropertiesMap()
 
 PropertiesMap::~PropertiesMap() { }
 
-search::fef::Properties &
+fef::Properties &
 PropertiesMap::lookupCreate(const vespalib::stringref &name)
 {
     return _propertiesMap[name];
 }
 
-const search::fef::Properties &
+const fef::Properties &
 PropertiesMap::lookup(const vespalib::stringref &name) const
 {
     PropsMap::const_iterator pos = _propertiesMap.find(name);
@@ -30,7 +29,7 @@ PropertiesMap::lookup(const vespalib::stringref &name) const
     return pos->second;
 }
 
-} // namespace engine
-} // namespace search
+}
 
 VESPALIB_HASH_MAP_INSTANTIATE(vespalib::string, search::fef::Properties);
+
diff --git a/searchlib/src/vespa/searchlib/engine/request.cpp b/searchlib/src/vespa/searchlib/engine/request.cpp
index e74152872b5..66b3bbac09b 100644
--- a/searchlib/src/vespa/searchlib/engine/request.cpp
+++ b/searchlib/src/vespa/searchlib/engine/request.cpp
@@ -2,8 +2,7 @@
 
 #include "request.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 Request::Request(const fastos::TimeStamp &start_time)
     : _startTime(start_time),
@@ -32,9 +31,6 @@ fastos::TimeStamp Request::getTimeLeft() const
     return _timeOfDoom - fastos::TimeStamp(fastos::ClockSystem::now());
 }
 
-Request::~Request()
-{
-}
+Request::~Request() = default;
 
-} // namespace engine
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/engine/searchapi.h b/searchlib/src/vespa/searchlib/engine/searchapi.h
index a0a177aed82..cdb974872cb 100644
--- a/searchlib/src/vespa/searchlib/engine/searchapi.h
+++ b/searchlib/src/vespa/searchlib/engine/searchapi.h
@@ -5,8 +5,7 @@
 #include "searchrequest.h"
 #include "searchreply.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 /**
  * A search client is the object being notified of the completion of
@@ -61,6 +60,5 @@ public:
     virtual ~SearchServer() {}
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.cpp b/searchlib/src/vespa/searchlib/engine/searchreply.cpp
index c39013222f0..ef39e4da027 100644
--- a/searchlib/src/vespa/searchlib/engine/searchreply.cpp
+++ b/searchlib/src/vespa/searchlib/engine/searchreply.cpp
@@ -2,8 +2,7 @@
 
 #include "searchreply.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 SearchReply::SearchReply()
     : valid(true),
@@ -22,7 +21,7 @@ SearchReply::SearchReply()
       request()
 { }
 
-SearchReply::~SearchReply() {}
+SearchReply::~SearchReply() = default;
 
 SearchReply::SearchReply(const SearchReply &rhs) :
     valid        (rhs.valid),
@@ -41,5 +40,5 @@ SearchReply::SearchReply(const SearchReply &rhs) :
     request() // NB not copied
 { }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/searchreply.h b/searchlib/src/vespa/searchlib/engine/searchreply.h
index 554d4fb43c1..b1c55fea874 100644
--- a/searchlib/src/vespa/searchlib/engine/searchreply.h
+++ b/searchlib/src/vespa/searchlib/engine/searchreply.h
@@ -2,15 +2,13 @@
 
 #pragma once
 
-#include <vector>
 #include <vespa/document/base/globalid.h>
 #include <vespa/searchlib/common/hitrank.h>
 #include <vespa/vespalib/util/array.h>
-#include <memory>
 #include <vespa/searchlib/engine/searchrequest.h>
+#include <vector>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 class SearchReply
 {
@@ -86,6 +84,5 @@ public:
     uint32_t getDistributionKey() const { return _distributionKey; }
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
index dd432e7b390..7159c83716b 100644
--- a/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
+++ b/searchlib/src/vespa/searchlib/engine/searchrequest.cpp
@@ -3,8 +3,7 @@
 #include "searchrequest.h"
 #include "packetconverter.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 SearchRequest::SearchRequest()
     : SearchRequest(fastos::ClockSystem::now()) {}
@@ -36,5 +35,5 @@ SearchRequest::Source::~Source() {
     }
 }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/searchrequest.h b/searchlib/src/vespa/searchlib/engine/searchrequest.h
index bb5cd376df5..805dd7703cd 100644
--- a/searchlib/src/vespa/searchlib/engine/searchrequest.h
+++ b/searchlib/src/vespa/searchlib/engine/searchrequest.h
@@ -2,14 +2,13 @@
 
 #pragma once
 
-#include <vespa/vespalib/stllike/string.h>
 #include "propertiesmap.h"
 #include "request.h"
 #include "source_description.h"
 
-namespace search {
-namespace fs4transport { class FS4Packet_QUERYX; }
-namespace engine {
+namespace search::fs4transport { class FS4Packet_QUERYX; }
+
+namespace search::engine {
 
 class SearchRequest : public Request
 {
@@ -80,6 +79,5 @@ public:
     ~SearchRequest();
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/source_description.cpp b/searchlib/src/vespa/searchlib/engine/source_description.cpp
index 36b7b36340e..bd285dcdee2 100644
--- a/searchlib/src/vespa/searchlib/engine/source_description.cpp
+++ b/searchlib/src/vespa/searchlib/engine/source_description.cpp
@@ -2,10 +2,9 @@
 
 #include "source_description.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 const vespalib::string SourceDescription::protocol("FS4");
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/source_description.h b/searchlib/src/vespa/searchlib/engine/source_description.h
index 7d901f13ee3..21274d4b097 100644
--- a/searchlib/src/vespa/searchlib/engine/source_description.h
+++ b/searchlib/src/vespa/searchlib/engine/source_description.h
@@ -3,8 +3,7 @@
 #pragma once
 #include <vespa/vespalib/stllike/string.h>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct SourceDescription {
     int listenPort;
@@ -12,6 +11,5 @@ struct SourceDescription {
     SourceDescription(int port) : listenPort(port) {}
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/tracereply.h b/searchlib/src/vespa/searchlib/engine/tracereply.h
index ebea612d125..32de6e6e6eb 100644
--- a/searchlib/src/vespa/searchlib/engine/tracereply.h
+++ b/searchlib/src/vespa/searchlib/engine/tracereply.h
@@ -3,14 +3,12 @@
 
 #include "propertiesmap.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct TraceReply
 {
     PropertiesMap propertiesMap;
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/transport_metrics.cpp b/searchlib/src/vespa/searchlib/engine/transport_metrics.cpp
index c2057f49bd8..b3696641f8e 100644
--- a/searchlib/src/vespa/searchlib/engine/transport_metrics.cpp
+++ b/searchlib/src/vespa/searchlib/engine/transport_metrics.cpp
@@ -2,8 +2,7 @@
 
 #include "transport_metrics.h"
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 TransportMetrics::QueryMetrics::QueryMetrics(metrics::MetricSet *parent)
     : metrics::MetricSet("query", "", "Query metrics", parent),
@@ -12,7 +11,7 @@ TransportMetrics::QueryMetrics::QueryMetrics(metrics::MetricSet *parent)
 {
 }
 
-TransportMetrics::QueryMetrics::~QueryMetrics() { }
+TransportMetrics::QueryMetrics::~QueryMetrics() = default;
 
 TransportMetrics::DocsumMetrics::DocsumMetrics(metrics::MetricSet *parent)
     : metrics::MetricSet("docsum", "", "Docsum metrics", parent),
@@ -22,7 +21,7 @@ TransportMetrics::DocsumMetrics::DocsumMetrics(metrics::MetricSet *parent)
 {
 }
 
-TransportMetrics::DocsumMetrics::~DocsumMetrics() { }
+TransportMetrics::DocsumMetrics::~DocsumMetrics() = default;
 
 TransportMetrics::TransportMetrics()
     : metrics::MetricSet("transport", "", "Transport server metrics", 0),
@@ -32,7 +31,7 @@ TransportMetrics::TransportMetrics()
 {
 }
 
-TransportMetrics::~TransportMetrics() { }
+TransportMetrics::~TransportMetrics() = default;
+
+}
 
-} // namespace engine
-} // namespace search
diff --git a/searchlib/src/vespa/searchlib/engine/transport_metrics.h b/searchlib/src/vespa/searchlib/engine/transport_metrics.h
index 288c7f12e2d..8b85438f688 100644
--- a/searchlib/src/vespa/searchlib/engine/transport_metrics.h
+++ b/searchlib/src/vespa/searchlib/engine/transport_metrics.h
@@ -5,8 +5,7 @@
 #include <vespa/metrics/metrics.h>
 #include <vespa/vespalib/util/sync.h>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 struct TransportMetrics : metrics::MetricSet
 {
@@ -32,9 +31,8 @@ struct TransportMetrics : metrics::MetricSet
     DocsumMetrics  docsum;
 
     TransportMetrics();
-    ~TransportMetrics();
+    ~TransportMetrics() override;
 };
 
-} // namespace engine
-} // namespace search
+}
 
diff --git a/searchlib/src/vespa/searchlib/engine/transportserver.cpp b/searchlib/src/vespa/searchlib/engine/transportserver.cpp
index 864903bbc44..c97995db44d 100644
--- a/searchlib/src/vespa/searchlib/engine/transportserver.cpp
+++ b/searchlib/src/vespa/searchlib/engine/transportserver.cpp
@@ -11,8 +11,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".engine.transportserver");
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 //-----------------------------------------------------------------------------
 
@@ -424,5 +423,5 @@ TransportServer::~TransportServer()
     }
 }
 
-} // namespace engine
-} // namespace search
+}
+
diff --git a/searchlib/src/vespa/searchlib/engine/transportserver.h b/searchlib/src/vespa/searchlib/engine/transportserver.h
index 76fba4e96fc..76327dd8fcd 100644
--- a/searchlib/src/vespa/searchlib/engine/transportserver.h
+++ b/searchlib/src/vespa/searchlib/engine/transportserver.h
@@ -4,21 +4,20 @@
 
 #include "transport_metrics.h"
 #include "source_description.h"
+#include "searchapi.h"
+#include "docsumapi.h"
+#include "monitorapi.h"
+#include <vespa/searchlib/common/packets.h>
 #include <vespa/fnet/iserveradapter.h>
 #include <vespa/fnet/ipackethandler.h>
 #include <vespa/fnet/task.h>
 #include <vespa/fnet/transport.h>
-#include <set>
-#include <queue>
-#include <vespa/searchlib/engine/searchapi.h>
-#include <vespa/searchlib/engine/docsumapi.h>
-#include <vespa/searchlib/engine/monitorapi.h>
-#include <vespa/searchlib/common/packets.h>
 #include <vespa/vespalib/util/sync.h>
 #include <vespa/fastos/thread.h>
+#include <set>
+#include <queue>
 
-namespace search {
-namespace engine {
+namespace search::engine {
 
 /**
  * Common transport server implementation interacting with the
@@ -331,6 +330,5 @@ public:
     ~TransportServer();
 };
 
-} // namespace engine
-} // namespace search
+}