Nested namespace

7 files changed, 11 insertions, 33 deletions

diff --git a/document/src/vespa/document/select/branch.cpp b/document/src/vespa/document/select/branch.cpp
index 5b28fad0df8..b3d5f97ccab 100644
--- a/document/src/vespa/document/select/branch.cpp
+++ b/document/src/vespa/document/select/branch.cpp
@@ -5,8 +5,7 @@
 #include <cassert>
 #include <ostream>
 
-namespace document {
-namespace select {
+namespace document::select {
 
 And::And(std::unique_ptr<Node> left, std::unique_ptr<Node> right, const char* name)
     : Branch(name ? name : "and"),
@@ -141,6 +140,4 @@ Not::trace(const Context& context, std::ostream& out) const
     return traceNotValue(context, out, *_child);
 }
 
-
-} // select
-} // document
+}
diff --git a/document/src/vespa/document/select/cloningvisitor.cpp b/document/src/vespa/document/select/cloningvisitor.cpp
index d695e3ec83d..75c8be55729 100644
--- a/document/src/vespa/document/select/cloningvisitor.cpp
+++ b/document/src/vespa/document/select/cloningvisitor.cpp
@@ -8,9 +8,7 @@
 #include "invalidconstant.h"
 #include "doctype.h" 
 
-namespace document {
-
-namespace select {
+namespace document::select {
 
 const int CloningVisitor::OrPriority;
 const int CloningVisitor::AndPriority;
@@ -46,7 +44,7 @@ CloningVisitor::CloningVisitor()
 { }
 
 
-CloningVisitor::~CloningVisitor() { }
+CloningVisitor::~CloningVisitor() = default;
 
 
 void
@@ -350,14 +348,11 @@ CloningVisitor::swap(CloningVisitor &rhs)
 
 
 void
-CloningVisitor::revisit(void)
+CloningVisitor::revisit()
 {
     _constVal = false;
     _priority = -1;
     _resultSet.clear();
 }
 
-
-}
-
 }
diff --git a/document/src/vespa/document/select/constant.cpp b/document/src/vespa/document/select/constant.cpp
index 8d1445f40a0..6bca17ff917 100644
--- a/document/src/vespa/document/select/constant.cpp
+++ b/document/src/vespa/document/select/constant.cpp
@@ -2,7 +2,6 @@
 
 #include "constant.h"
 #include "visitor.h"
-#include <cassert>
 #include <ostream>
 
 namespace document::select {
diff --git a/document/src/vespa/document/select/context.cpp b/document/src/vespa/document/select/context.cpp
index 3a728db33f8..384ac0dad6e 100644
--- a/document/src/vespa/document/select/context.cpp
+++ b/document/src/vespa/document/select/context.cpp
@@ -34,7 +34,7 @@ Context::Context(const DocumentUpdate& docUpdate)
       _variables()
 { }
 
-Context::~Context() { }
+Context::~Context() = default;
 
 std::unique_ptr<Value>
 Context::getValue(const vespalib::string & value) const {
diff --git a/document/src/vespa/document/select/result.cpp b/document/src/vespa/document/select/result.cpp
index 3a6b8783faa..f7f95732c78 100644
--- a/document/src/vespa/document/select/result.cpp
+++ b/document/src/vespa/document/select/result.cpp
@@ -3,16 +3,13 @@
 #include "result.h"
 #include <ostream>
 
-namespace document {
-namespace select {
+namespace document::select {
 
 Result Result::Invalid;
 Result Result::False;
 Result Result::True;
 
-Result::Result()
-{
-}
+Result::Result() = default;
 
 const Result&
 Result::operator!() const {
@@ -50,5 +47,4 @@ Result::print(std::ostream& out, bool,
     else out << "False";
 }
 
-} // select
-} // document
+}
diff --git a/document/src/vespa/document/select/result.h b/document/src/vespa/document/select/result.h
index 7688503d2de..9cc33b79944 100644
--- a/document/src/vespa/document/select/result.h
+++ b/document/src/vespa/document/select/result.h
@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <cassert>
 #include <vespa/vespalib/util/hdr_abort.h>
 #include <vespa/document/util/printable.h>
 
diff --git a/document/src/vespa/document/select/simpleparser.cpp b/document/src/vespa/document/select/simpleparser.cpp
index 879a1f195e8..9a898e63eeb 100644
--- a/document/src/vespa/document/select/simpleparser.cpp
+++ b/document/src/vespa/document/select/simpleparser.cpp
@@ -4,11 +4,7 @@
 #include "compare.h"
 #include <cerrno>
 
-namespace document {
-
-namespace select {
-
-namespace simple {
+namespace document::select::simple {
 
 size_t eatWhite(const char * s, size_t len)
 {
@@ -197,8 +193,4 @@ bool SelectionParser::parse(vespalib::stringref s)
     return retval;
 }
 
-
-
-} // simple
-} // select
-} // parser
+}