diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-27 14:37:44 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-07-31 17:27:03 +0200 |
commit | 60d5aaa6087b9092153e82466206e598124c3c24 (patch) | |
tree | 09a493e219701a30b37d3481510ad68fc7660fe9 /document | |
parent | 2c6c59936b99a18d364d46aeee2974aeef25774b (diff) |
Partly revert previous commit
Diffstat (limited to 'document')
-rw-r--r-- | document/src/vespa/document/base/fieldpath.cpp | 4 | ||||
-rw-r--r-- | document/src/vespa/document/base/fieldpath.h | 4 | ||||
-rw-r--r-- | document/src/vespa/document/select/valuenodes.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/document/src/vespa/document/base/fieldpath.cpp b/document/src/vespa/document/base/fieldpath.cpp index 469b3edc206..7d861dc782b 100644 --- a/document/src/vespa/document/base/fieldpath.cpp +++ b/document/src/vespa/document/base/fieldpath.cpp @@ -179,8 +179,8 @@ FieldPath::FieldPath() : _path() { } -//FieldPath::FieldPath(const FieldPath &) = default; -//FieldPath & FieldPath::operator=(const FieldPath &) = default; +FieldPath::FieldPath(const FieldPath &) = default; +FieldPath & FieldPath::operator=(const FieldPath &) = default; FieldPath::~FieldPath() { } FieldPath::iterator FieldPath::insert(iterator pos, FieldPathEntry && entry) { return _path.insert(pos, std::move(entry)); } diff --git a/document/src/vespa/document/base/fieldpath.h b/document/src/vespa/document/base/fieldpath.h index 2cb230d1388..00dad12581a 100644 --- a/document/src/vespa/document/base/fieldpath.h +++ b/document/src/vespa/document/base/fieldpath.h @@ -117,8 +117,8 @@ public: typedef std::unique_ptr<FieldPath> UP; FieldPath(); - FieldPath(const FieldPath &) = delete; - FieldPath & operator=(const FieldPath &) = delete; + FieldPath(const FieldPath &); + FieldPath & operator=(const FieldPath &); FieldPath(FieldPath &&) = default; FieldPath & operator=(FieldPath &&) = default; ~FieldPath(); diff --git a/document/src/vespa/document/select/valuenodes.cpp b/document/src/vespa/document/select/valuenodes.cpp index 39688e2fc7b..cc5ec08dc73 100644 --- a/document/src/vespa/document/select/valuenodes.cpp +++ b/document/src/vespa/document/select/valuenodes.cpp @@ -195,9 +195,6 @@ FieldValueNode::FieldValueNode(const vespalib::string& doctype, { } -//FieldValueNode::FieldValueNode(const FieldValueNode &) = default; -//FieldValueNode & FieldValueNode::operator = (const FieldValueNode &) = default; - FieldValueNode::~FieldValueNode() {} vespalib::string FieldValueNode::extractFieldName(const std::string & fieldExpression) { |