Use nested namespace

5 files changed, 10 insertions, 29 deletions

diff --git a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h
index 9489d273489..07d625726e0 100644
--- a/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h
+++ b/searchlib/src/vespa/searchlib/features/termeditdistancefeature.h
@@ -5,8 +5,7 @@
 #include <vespa/searchlib/fef/featureexecutor.h>
 #include <vespa/searchlib/common/feature.h>
 
-namespace search {
-namespace features {
+namespace search::features {
 
 /**
  * Implements a cell class for the cost table constructed when running the term edit distance calculator. This is
@@ -138,4 +137,4 @@ private:
     TermEditDistanceConfig _config; // The config for this blueprint.
 };
 
-}}
+}
diff --git a/searchlib/src/vespa/searchlib/features/utils.h b/searchlib/src/vespa/searchlib/features/utils.h
index e8393f9cf30..501dff17b41 100644
--- a/searchlib/src/vespa/searchlib/features/utils.h
+++ b/searchlib/src/vespa/searchlib/features/utils.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <limits>
-#include <string>
 #include <vespa/searchlib/fef/iqueryenvironment.h>
 #include <vespa/searchlib/fef/table.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
@@ -12,9 +10,7 @@
 #include <vespa/searchlib/common/feature.h>
 #include <vespa/vespalib/util/string_hash.h>
 
-namespace search {
-namespace features {
-namespace util {
+namespace search::features::util {
 
 /**
  * Maximum feature value
@@ -217,7 +213,4 @@ getTermFieldHandle(const search::fef::IQueryEnvironment &env, uint32_t termId, u
 const search::fef::ITermData *
 getTermByLabel(const search::fef::IQueryEnvironment &env, const vespalib::string &label);
 
-} // namespace util
-} // namespace features
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/fef/blueprint.h b/searchlib/src/vespa/searchlib/fef/blueprint.h
index 998f194b45c..4605df10eda 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprint.h
+++ b/searchlib/src/vespa/searchlib/fef/blueprint.h
@@ -2,8 +2,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <vector>
 #include "featureexecutor.h"
 #include "iindexenvironment.h"
 #include "iqueryenvironment.h"
@@ -14,8 +12,7 @@
 
 namespace vespalib { class Stash; }
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * A blueprint is a description of a named feature executor with a
@@ -251,6 +248,4 @@ public:
     virtual ~Blueprint();
 };
 
-} // namespace fef
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/fef/featurenamebuilder.h b/searchlib/src/vespa/searchlib/fef/featurenamebuilder.h
index d823b7e8551..2b8844ac526 100644
--- a/searchlib/src/vespa/searchlib/fef/featurenamebuilder.h
+++ b/searchlib/src/vespa/searchlib/fef/featurenamebuilder.h
@@ -5,8 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vector>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * An object of this class may be used to build feature names in a
@@ -70,6 +69,4 @@ public:
     vespalib::string buildName() const;
 };
 
-} // namespace fef
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/fef/properties.h b/searchlib/src/vespa/searchlib/fef/properties.h
index f85bdd9d1ab..06305a14ef6 100644
--- a/searchlib/src/vespa/searchlib/fef/properties.h
+++ b/searchlib/src/vespa/searchlib/fef/properties.h
@@ -6,8 +6,7 @@
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <vector>
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 class Properties;
 
@@ -319,6 +318,4 @@ swap(Properties & a, Properties & b)
 }
 
 
-} // namespace fef
-} // namespace search
-
+}