diff options
Diffstat (limited to 'document')
-rw-r--r-- | document/src/tests/documenttestcase.cpp | 1 | ||||
-rw-r--r-- | document/src/vespa/document/base/documentid.cpp | 9 | ||||
-rw-r--r-- | document/src/vespa/document/base/documentid.h | 1 |
3 files changed, 3 insertions, 8 deletions
diff --git a/document/src/tests/documenttestcase.cpp b/document/src/tests/documenttestcase.cpp index b460d318099..b0128607ac5 100644 --- a/document/src/tests/documenttestcase.cpp +++ b/document/src/tests/documenttestcase.cpp @@ -28,6 +28,7 @@ using namespace fieldvalue; TEST(DocumentTest, testSizeOf) { + EXPECT_EQ(24ul, sizeof(DocumentId)); EXPECT_EQ(128ul, sizeof(Document)); EXPECT_EQ(72ul, sizeof(StructFieldValue)); EXPECT_EQ(24ul, sizeof(StructuredFieldValue)); diff --git a/document/src/vespa/document/base/documentid.cpp b/document/src/vespa/document/base/documentid.cpp index 69e2aacd073..5c240922e6d 100644 --- a/document/src/vespa/document/base/documentid.cpp +++ b/document/src/vespa/document/base/documentid.cpp @@ -27,12 +27,6 @@ DocumentId::DocumentId(vespalib::nbostream & is) is.adjustReadPos(strlen(is.peek()) + 1); } -DocumentId::DocumentId(const IdString& id) - : _globalId(), - _id(id.clone()) -{ -} - DocumentId::DocumentId(const DocumentId & rhs) = default; DocumentId & DocumentId::operator = (const DocumentId & rhs) = default; DocumentId::~DocumentId() = default; @@ -42,7 +36,8 @@ DocumentId::toString() const { return _id->toString(); } -void DocumentId::set(vespalib::stringref id) { +void +DocumentId::set(vespalib::stringref id) { _id.reset(IdString::createIdString(id).release()); _globalId.first = false; } diff --git a/document/src/vespa/document/base/documentid.h b/document/src/vespa/document/base/documentid.h index b69097e52fd..99ab63bd296 100644 --- a/document/src/vespa/document/base/documentid.h +++ b/document/src/vespa/document/base/documentid.h @@ -35,7 +35,6 @@ public: DocumentId(); DocumentId(vespalib::nbostream & os); - explicit DocumentId(const IdString& id); DocumentId(DocumentId && rhs) = default; DocumentId & operator = (DocumentId && rhs) = default; DocumentId(const DocumentId & rhs); |