diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-14 08:33:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-14 13:50:54 +0000 |
commit | 6ddc242f9ab1331c9bf0d5ce373a7a4e3b153196 (patch) | |
tree | ba6f16e8d502ef06bdf3287a7d87ba380745e5ba /document | |
parent | 8ab0d17f86ed4f4680f2c3237c4b5dd9937b3adb (diff) |
GC constructor collapsed away.
Diffstat (limited to 'document')
-rw-r--r-- | document/src/vespa/document/fieldvalue/document.cpp | 14 | ||||
-rw-r--r-- | document/src/vespa/document/fieldvalue/document.h | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/document/src/vespa/document/fieldvalue/document.cpp b/document/src/vespa/document/fieldvalue/document.cpp index 4ff4d3a2143..110bbeca6cd 100644 --- a/document/src/vespa/document/fieldvalue/document.cpp +++ b/document/src/vespa/document/fieldvalue/document.cpp @@ -65,19 +65,7 @@ Document::Document() Document::Document(const Document& other) = default; -Document::Document(const DataType &type, const DocumentId& documentId) - : StructuredFieldValue(verifyDocumentType(&type)), - _id(documentId), - _fields(getType().getFieldsType()), - _lastModified(0) -{ - _fields.setDocumentType(getType()); - if (documentId.hasDocType() && documentId.getDocType() != type.getName()) { - throwTypeMismatch(type.getName(), documentId.getDocType()); - } -} - -Document::Document(const DataType &type, DocumentId && documentId) +Document::Document(const DataType &type, DocumentId documentId) : StructuredFieldValue(verifyDocumentType(&type)), _id(std::move(documentId)), _fields(getType().getFieldsType()), diff --git a/document/src/vespa/document/fieldvalue/document.h b/document/src/vespa/document/fieldvalue/document.h index e5a8a9ba368..d69f202c460 100644 --- a/document/src/vespa/document/fieldvalue/document.h +++ b/document/src/vespa/document/fieldvalue/document.h @@ -39,8 +39,7 @@ public: Document(); Document(const Document&); - Document(const DataType &, const DocumentId&); - Document(const DataType &, DocumentId &&); + Document(const DataType &, DocumentId id); Document(const DocumentTypeRepo& repo, ByteBuffer& buffer, const DataType *anticipatedType = nullptr); Document(const DocumentTypeRepo& repo, vespalib::nbostream& stream, const DataType *anticipatedType = nullptr); /** |