Use nested namespace definitions.

8 files changed, 15 insertions, 53 deletions

diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.cpp b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.cpp
index 6a56cb606d2..dcdaf1681a4 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.cpp
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.cpp
@@ -8,9 +8,7 @@
 #include <cmath>
 #include <cstdlib>
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 Metrics::Metrics(const Computer *source) :
     _source(source),
@@ -337,7 +335,4 @@ Metrics::toString() const
     return vespalib::make_string("Metrics(match %f)", getMatch());
 }
 
-
-} // fieldmatch
-} // features
-} // search
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
index eadda3209ad..a5f0934cd64 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/metrics.h
@@ -5,9 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include <vector>
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 class Computer;
 
@@ -557,7 +555,4 @@ private:
     uint32_t              _queryLength; // num terms searching this field
 };
 
-} // fieldmatch
-} // features
-} // search
-
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/params.cpp b/searchlib/src/vespa/searchlib/features/fieldmatch/params.cpp
index facf1a5f64a..f17d3cffcd2 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/params.cpp
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/params.cpp
@@ -4,9 +4,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".features.fieldmatch.params");
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 Params::Params() :
     _proximityLimit(10),
@@ -40,5 +38,3 @@ Params::valid()
 }
 
 }
-}
-}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/params.h b/searchlib/src/vespa/searchlib/features/fieldmatch/params.h
index 21c35f19472..dcbd61676ad 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/params.h
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/params.h
@@ -5,9 +5,7 @@
 #include <vector>
 #include <cstdint>
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 /**
  * The parameters to a string match metric calculator.
@@ -256,7 +254,4 @@ private:
     std::vector<feature_t> _proximityTable;
 };
 
-} // fieldmatch
-} // features
-} // search
-
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.cpp b/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.cpp
index 8f5f86d1628..82f2beeea32 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.cpp
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.cpp
@@ -5,9 +5,7 @@
 #include "metrics.h"
 #include <vespa/vespalib/util/stringfmt.h>
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 SegmentStart::SegmentStart(Computer *owner, const Metrics & metrics, uint32_t previousJ, uint32_t i, uint32_t j) :
     _owner(owner),
@@ -95,6 +93,4 @@ SegmentStart::toString() {
     }
 }
 
-} // fieldmatch
-} // features
-} // search
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.h b/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.h
index dd4b9406036..9b3fbc7b987 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.h
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/segmentstart.h
@@ -5,9 +5,7 @@
 #include <limits>
 #include "metrics.h"
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 /**
  * <p>Information on segment start points stored temporarily during string match metric calculation.</p>
@@ -179,7 +177,4 @@ private:
     bool        _open;                     // There are possibly more j's to try at this starting point.
 };
 
-} // fieldmatch
-} // features
-} // search
-
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.cpp b/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.cpp
index 045bc277454..ca3b79f17bc 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.cpp
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.cpp
@@ -3,9 +3,7 @@
 #include "simplemetrics.h"
 #include <vespa/vespalib/stllike/asciistream.h>
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 SimpleMetrics::SimpleMetrics(const Params & params) :
     _params(params),
@@ -30,7 +28,4 @@ vespalib::string SimpleMetrics::toString() const
     return ss.str();
 }
 
-
-} // fieldmatch
-} // features
-} // search
+}
diff --git a/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.h b/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.h
index 6c5a67884d8..ee1c11215d1 100644
--- a/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.h
+++ b/searchlib/src/vespa/searchlib/features/fieldmatch/simplemetrics.h
@@ -5,9 +5,7 @@
 #include <vespa/vespalib/stllike/string.h>
 #include "params.h"
 
-namespace search {
-namespace features {
-namespace fieldmatch {
+namespace search::features::fieldmatch {
 
 /**
  * The collection of simple metrics calculated when traversing the query terms of the query environment.
@@ -180,7 +178,4 @@ public:
     vespalib::string toString() const;
 };
 
-} // fieldmatch
-} // features
-} // search
-
+}