Use nested namespace

13 files changed, 27 insertions, 65 deletions

diff --git a/searchlib/src/vespa/searchlib/fef/matchdatalayout.cpp b/searchlib/src/vespa/searchlib/fef/matchdatalayout.cpp
index 0b9a0c23a80..169dfd45863 100644
--- a/searchlib/src/vespa/searchlib/fef/matchdatalayout.cpp
+++ b/searchlib/src/vespa/searchlib/fef/matchdatalayout.cpp
@@ -2,8 +2,7 @@
 
 #include "matchdatalayout.h"
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 MatchDataLayout::MatchDataLayout()
     : _numTermFields(0),
@@ -26,5 +25,4 @@ MatchDataLayout::createMatchData() const
     return md;
 }
 
-} // namespace fef
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/fef/matchdatalayout.h b/searchlib/src/vespa/searchlib/fef/matchdatalayout.h
index b50e6bd32ed..53f94128e67 100644
--- a/searchlib/src/vespa/searchlib/fef/matchdatalayout.h
+++ b/searchlib/src/vespa/searchlib/fef/matchdatalayout.h
@@ -5,8 +5,7 @@
 #include "handle.h"
 #include "matchdata.h"
 
-namespace search {
-namespace fef {
+namespace search::fef {
 
 /**
  * This class is used to describe the layout of term match data and
@@ -46,6 +45,4 @@ public:
     MatchData::UP createMatchData() const;
 };
 
-} // namespace fef
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
index 92111645761..dfc4793923a 100644
--- a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
@@ -12,8 +12,7 @@
 #include <vespa/log/log.h>
 LOG_SETUP(".queryeval.blueprint");
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 //-----------------------------------------------------------------------------
 
@@ -526,8 +525,7 @@ LeafBlueprint::set_tree_size(uint32_t value)
 
 //-----------------------------------------------------------------------------
 
-} // namespace queryeval
-} // namespace search
+}
 
 //-----------------------------------------------------------------------------
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/fake_result.h b/searchlib/src/vespa/searchlib/queryeval/fake_result.h
index 3442e0df944..83d5921e4c7 100644
--- a/searchlib/src/vespa/searchlib/queryeval/fake_result.h
+++ b/searchlib/src/vespa/searchlib/queryeval/fake_result.h
@@ -7,8 +7,7 @@
 #include <vespa/searchlib/common/fslimits.h>
 #include <vector>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 class FakeResult
 {
@@ -104,6 +103,4 @@ public:
 
 std::ostream &operator << (std::ostream &out, const FakeResult &result);
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
index 385412ddcfd..8da81368c72 100644
--- a/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
+++ b/searchlib/src/vespa/searchlib/queryeval/leaf_blueprints.h
@@ -7,9 +7,7 @@
 #include "fake_result.h"
 #include "searchable.h"
 
-namespace search {
-
-namespace queryeval {
+namespace search::queryeval {
 
 //-----------------------------------------------------------------------------
 
@@ -79,6 +77,4 @@ public:
 
 //-----------------------------------------------------------------------------
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/posting_info.h b/searchlib/src/vespa/searchlib/queryeval/posting_info.h
index ac8636814d6..b7f386475d8 100644
--- a/searchlib/src/vespa/searchlib/queryeval/posting_info.h
+++ b/searchlib/src/vespa/searchlib/queryeval/posting_info.h
@@ -4,8 +4,7 @@
 #include <cstdint>
 #include <memory>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
     
 /**
  * Interface for getting global information stored in underlying posting list
@@ -42,5 +41,4 @@ public:
     int32_t getMaxWeight() const { return _maxWeight; }
 };
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/simpleresult.cpp b/searchlib/src/vespa/searchlib/queryeval/simpleresult.cpp
index e43c192a74d..5195f03b8db 100644
--- a/searchlib/src/vespa/searchlib/queryeval/simpleresult.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/simpleresult.cpp
@@ -4,8 +4,7 @@
 #include <cassert>
 #include <ostream>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 SimpleResult &
 SimpleResult::addHit(uint32_t docid)
@@ -74,5 +73,4 @@ operator << (std::ostream &out, const SimpleResult &result)
     return out;
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/simpleresult.h b/searchlib/src/vespa/searchlib/queryeval/simpleresult.h
index c7755758fa8..30c88bb10c7 100644
--- a/searchlib/src/vespa/searchlib/queryeval/simpleresult.h
+++ b/searchlib/src/vespa/searchlib/queryeval/simpleresult.h
@@ -5,8 +5,7 @@
 #include <vector>
 #include "searchiterator.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * Simple result class containing only document ids. This class will
@@ -83,6 +82,4 @@ public:
 
 std::ostream &operator << (std::ostream &out, const SimpleResult &result);
 
-} // namespace queryeval
-} // namespace search
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
index e73409240fa..789bfc40782 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.cpp
@@ -11,8 +11,7 @@ LOG_SETUP(".queryeval.parallel_weak_and_search");
 
 using vespalib::make_string;
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 typedef ParallelWeakAndSearch::MatchParams MatchParams;
 typedef ParallelWeakAndSearch::RankParams RankParams;
@@ -256,5 +255,4 @@ ParallelWeakAndSearch::create(search::fef::TermFieldMatchData &tfmd,
     }
 }
 
-}  // namespace queryeval
-}  // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
index c29e2f95d23..b561292d4ac 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/parallel_weak_and_search.h
@@ -1,15 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/searchlib/queryeval/searchiterator.h>
 #include "wand_parts.h"
-#include "parallel_weak_and_search.h"
 #include "weak_and_heap.h"
+#include <vespa/searchlib/queryeval/searchiterator.h>
 #include <vespa/searchlib/fef/matchdata.h>
 #include <vespa/searchlib/fef/termfieldmatchdata.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 /**
  * WAND search iterator that uses a shared heap between match threads.
@@ -78,8 +76,4 @@ struct ParallelWeakAndSearch : public SearchIterator
                                      bool strict);
 };
 
-} // namespace queryeval
-} // namespace search
-
-
-
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
index 8f696c3b399..9fbf9f7d850 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/wand_parts.h
@@ -15,9 +15,7 @@
 #include <vespa/searchlib/attribute/i_document_weight_attribute.h>
 #include <vespa/vespalib/util/stringfmt.h>
 
-namespace search {
-namespace queryeval {
-namespace wand {
+namespace search::queryeval::wand {
 
 //-----------------------------------------------------------------------------
 
@@ -659,9 +657,7 @@ public:
 
 //-----------------------------------------------------------------------------
 
-} // namespace wand
-} // namespace queryeval
-} // namespace search
+}
 
 //-----------------------------------------------------------------------------
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.cpp b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.cpp
index 638ea040773..dc84eb45b8a 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.cpp
@@ -2,8 +2,7 @@
 
 #include "weak_and_heap.h"
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
 
 SharedWeakAndPriorityQueue::SharedWeakAndPriorityQueue(uint32_t scoresToTrack) :
     WeakAndHeap(scoresToTrack),
@@ -36,5 +35,4 @@ SharedWeakAndPriorityQueue::adjust(score_t *begin, score_t *end)
     }
 }
 
-} // namespace queryeval
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h
index b9aa19f2ecb..d6105d7e6f2 100644
--- a/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h
+++ b/searchlib/src/vespa/searchlib/queryeval/wand/weak_and_heap.h
@@ -5,8 +5,7 @@
 #include <vespa/vespalib/util/priority_queue.h>
 #include <vespa/vespalib/util/sync.h>
 
-namespace search {
-namespace queryeval {
+namespace search::queryeval {
     
 /**
  * An interface used to insert scores into an underlying heap (or similar data structure)
@@ -63,6 +62,4 @@ public:
     void adjust(score_t *begin, score_t *end) override;
 };
 
-} // namespace queryeval
-} // namespace search
-
+}