summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-01-03 17:35:28 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-01-08 18:41:21 +0000
commitd376b994166081ef37939112138c4d1854f50bac (patch)
treeb032b12d785ec127b35a19c31c45708da84af3c2
parent212134219871d29304fc4045d8861401f11ed732 (diff)
Nested namespace
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/iterators.cpp8
-rw-r--r--searchlib/src/vespa/searchlib/queryeval/iterators.h9
2 files changed, 4 insertions, 13 deletions
diff --git a/searchlib/src/vespa/searchlib/queryeval/iterators.cpp b/searchlib/src/vespa/searchlib/queryeval/iterators.cpp
index 7b8485ad2f5..32f6122558e 100644
--- a/searchlib/src/vespa/searchlib/queryeval/iterators.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/iterators.cpp
@@ -2,9 +2,7 @@
#include "iterators.h"
-namespace search {
-
-namespace queryeval {
+namespace search::queryeval {
RankedSearchIteratorBase::
RankedSearchIteratorBase(const fef::TermFieldMatchDataArray &matchData)
@@ -13,6 +11,4 @@ RankedSearchIteratorBase(const fef::TermFieldMatchDataArray &matchData)
_needUnpack(1)
{ }
-} // namespace queryeval
-
-} // namespace search
+}
diff --git a/searchlib/src/vespa/searchlib/queryeval/iterators.h b/searchlib/src/vespa/searchlib/queryeval/iterators.h
index 79c91f6be39..43d046a78b7 100644
--- a/searchlib/src/vespa/searchlib/queryeval/iterators.h
+++ b/searchlib/src/vespa/searchlib/queryeval/iterators.h
@@ -5,9 +5,7 @@
#include "searchiterator.h"
#include <vespa/searchlib/fef/termfieldmatchdataarray.h>
-namespace search {
-
-namespace queryeval {
+namespace search::queryeval {
class DocIdAndFeatures;
@@ -28,7 +26,4 @@ public:
RankedSearchIteratorBase(const fef::TermFieldMatchDataArray &matchData);
};
-} // namespace queryeval
-
-} // namespace search
-
+}