aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-05-04 16:05:42 +0200
committerHenning Baldersheim <balder@oath.com>2018-05-08 10:40:06 +0200
commit0196b41f4e5c11188f020a17a4c48ecfcf638293 (patch)
tree1598ec9172d3aa901f05e027a9a44810113136e5
parent400362fdd2374a335348b39de8d8b011cab099d7 (diff)
Nested namespace.
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/match_master.cpp6
-rw-r--r--searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp6
2 files changed, 4 insertions, 8 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
index 370c4b930e1..950f40104c4 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
@@ -10,8 +10,7 @@
#include <vespa/log/log.h>
LOG_SETUP(".proton.matching.match_master");
-namespace proton {
-namespace matching {
+namespace proton::matching {
using namespace search::fef;
using search::queryeval::SearchIterator;
@@ -144,5 +143,4 @@ MatchMaster::getFeatureSet(const MatchToolsFactory &matchToolsFactory,
return retval;
}
-} // namespace proton::matching
-} // namespace proton
+}
diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
index 308f8d9e1b5..354cfb69f00 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_phase_limiter.cpp
@@ -12,8 +12,7 @@ using search::queryeval::IRequestContext;
using search::queryeval::AndSearchStrict;
using search::queryeval::NoUnpack;
-namespace proton {
-namespace matching {
+namespace proton::matching {
namespace {
@@ -165,5 +164,4 @@ MatchPhaseLimiter::getDocIdSpaceEstimate() const
return _coverage.getEstimate();
}
-} // namespace proton::matching
-} // namespace proton
+}