summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2019-11-12 10:20:49 +0000
committerHenning Baldersheim <balder@oath.com>2019-11-12 10:42:51 +0000
commit465af0737430c7a6f08bf4052b2c45e7c5e7a8a7 (patch)
tree9a9eec251640a8e4b3e8f2b572ff041a01e9a002 /document
parentb7db73b816cf691e42d94c28e63b598eb6fb669e (diff)
Nested namespace
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/select/value.cpp6
-rw-r--r--document/src/vespa/document/select/value.h7
-rw-r--r--document/src/vespa/document/select/valuenodes.cpp4
3 files changed, 6 insertions, 11 deletions
diff --git a/document/src/vespa/document/select/value.cpp b/document/src/vespa/document/select/value.cpp
index 5ebf527b82b..a33ee27afdb 100644
--- a/document/src/vespa/document/select/value.cpp
+++ b/document/src/vespa/document/select/value.cpp
@@ -5,8 +5,7 @@
#include <vespa/document/fieldvalue/fieldvalue.h>
#include <ostream>
-namespace document {
-namespace select {
+namespace document::select {
ResultList
Value::globCompare(const Value& value) const
@@ -418,5 +417,4 @@ ArrayValue::doCompare(const Value& value, const Predicate& cmp) const
}
}
-} // select
-} // document
+}
diff --git a/document/src/vespa/document/select/value.h b/document/src/vespa/document/select/value.h
index 2951117302e..c21e1a96470 100644
--- a/document/src/vespa/document/select/value.h
+++ b/document/src/vespa/document/select/value.h
@@ -23,8 +23,7 @@
#include <iosfwd>
#include "resultlist.h"
-namespace document {
-namespace select {
+namespace document::select {
class Value : public document::Printable
{
@@ -241,6 +240,4 @@ private:
ValueMap _values;
};
-} // select
-} // document
-
+}
diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp
index bc94e3667d2..b0c1cfdaac8 100644
--- a/document/src/vespa/document/select/valuenodes.cpp
+++ b/document/src/vespa/document/select/valuenodes.cpp
@@ -222,8 +222,8 @@ private:
std::unique_ptr<Value> getInternalValue(const FieldValue &fval) const;
};
-IteratorHandler::IteratorHandler() { }
-IteratorHandler::~IteratorHandler() { }
+IteratorHandler::IteratorHandler() = default;
+IteratorHandler::~IteratorHandler() = default;
bool
IteratorHandler::hasSingleValue() const {