diff options
author | Henning Baldersheim <balder@oath.com> | 2019-11-12 13:51:19 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2019-11-12 13:51:19 +0000 |
commit | 028207b297de7b38e3b73350e3d20e2d9b8bfa30 (patch) | |
tree | c7601f5aaeb0dd181c21617f3ed60df8a4d507b2 /document | |
parent | e2308376344d4fa36ccc4d8e72b802b5953864fe (diff) |
Nested namespace
Diffstat (limited to 'document')
-rw-r--r-- | document/src/vespa/document/select/valuenode.h | 3 | ||||
-rw-r--r-- | document/src/vespa/document/select/valuenodes.cpp | 4 | ||||
-rw-r--r-- | document/src/vespa/document/select/valuenodes.h | 17 |
3 files changed, 10 insertions, 14 deletions
diff --git a/document/src/vespa/document/select/valuenode.h b/document/src/vespa/document/select/valuenode.h index 3f493649e87..04ed8178b40 100644 --- a/document/src/vespa/document/select/valuenode.h +++ b/document/src/vespa/document/select/valuenode.h @@ -6,8 +6,6 @@ * @brief Node representing a value in the tree * * @author H�kon Humberset - * @date 2007-04-20 - * @version $Id$ */ #pragma once @@ -51,4 +49,3 @@ protected: }; } - diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp index 1eb25b9b6c6..9cfdae14de1 100644 --- a/document/src/vespa/document/select/valuenodes.cpp +++ b/document/src/vespa/document/select/valuenodes.cpp @@ -192,7 +192,8 @@ FieldValueNode::FieldValueNode(const vespalib::string& doctype, { } -FieldValueNode::~FieldValueNode() {} +FieldValueNode::~FieldValueNode() = default; + vespalib::string FieldValueNode::extractFieldName(const std::string & fieldExpression) { std::smatch match; @@ -1075,4 +1076,3 @@ const vespalib::string& FieldExprNode::resolve_doctype() const { } } - diff --git a/document/src/vespa/document/select/valuenodes.h b/document/src/vespa/document/select/valuenodes.h index 02079c0b5df..fa592055477 100644 --- a/document/src/vespa/document/select/valuenodes.h +++ b/document/src/vespa/document/select/valuenodes.h @@ -6,14 +6,14 @@ #include <vespa/document/base/fieldpath.h> namespace document { + class BucketDistribution; + class BucketIdFactory; + class DocumentId; + class BucketId; + class DocumentType; +} -class BucketDistribution; -class BucketIdFactory; -class DocumentId; -class BucketId; -class DocumentType; - -namespace select { +namespace document::select { class InvalidValueNode : public ValueNode { @@ -358,5 +358,4 @@ private: std::ostream&) const; }; -} // select -} // document +} |