aboutsummaryrefslogtreecommitdiffstats
path: root/storageapi
diff options
context:
space:
mode:
authorHaavard <havardpe@yahoo-inc.com>2017-03-20 13:04:33 +0000
committerHaavard <havardpe@yahoo-inc.com>2017-03-27 09:53:26 +0000
commit23abed1a0bc4f4c5ea47b43fc7ea0645e63a26e6 (patch)
tree6d943bbe31738f7e9b84979e4fd63dfd76eef580 /storageapi
parent8844ccb7297e8a5120dd903c85e923f2f93aa693 (diff)
remove most usage of LinkedPtr from vespa
Diffstat (limited to 'storageapi')
-rw-r--r--storageapi/src/vespa/storageapi/message/batch.cpp6
-rw-r--r--storageapi/src/vespa/storageapi/message/batch.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/storageapi/src/vespa/storageapi/message/batch.cpp b/storageapi/src/vespa/storageapi/message/batch.cpp
index a3dcea3d13f..405d5b4c9d2 100644
--- a/storageapi/src/vespa/storageapi/message/batch.cpp
+++ b/storageapi/src/vespa/storageapi/message/batch.cpp
@@ -46,21 +46,21 @@ BatchPutRemoveCommand::BatchPutRemoveCommand(const document::BucketId& bucketId)
void
BatchPutRemoveCommand::addPut(document::Document::SP document, uint64_t ts)
{
- _operations.push_back(vespalib::LinkedPtr<Operation>(new PutOperation(document, ts)));
+ _operations.push_back(std::unique_ptr<Operation>(new PutOperation(document, ts)));
_approxSize += document->serialize()->getLength();
}
void
BatchPutRemoveCommand::addHeaderUpdate(document::Document::SP document, uint64_t ts, uint64_t timestampToUpdate)
{
- _operations.push_back(vespalib::LinkedPtr<Operation>(new HeaderUpdateOperation(document, ts, timestampToUpdate)));
+ _operations.push_back(std::unique_ptr<Operation>(new HeaderUpdateOperation(document, ts, timestampToUpdate)));
_approxSize += document->serialize()->getLength();
}
void
BatchPutRemoveCommand::addRemove(const document::DocumentId& docId, uint64_t ts)
{
- _operations.push_back(vespalib::LinkedPtr<Operation>(new RemoveOperation(docId, ts)));
+ _operations.push_back(std::unique_ptr<Operation>(new RemoveOperation(docId, ts)));
_approxSize += docId.toString().length();
}
diff --git a/storageapi/src/vespa/storageapi/message/batch.h b/storageapi/src/vespa/storageapi/message/batch.h
index a1b92fa1f0e..b4788a5ae75 100644
--- a/storageapi/src/vespa/storageapi/message/batch.h
+++ b/storageapi/src/vespa/storageapi/message/batch.h
@@ -118,7 +118,7 @@ public:
DECLARE_STORAGECOMMAND(BatchPutRemoveCommand, onBatchPutRemove)
private:
- std::vector<vespalib::LinkedPtr<Operation> > _operations;
+ std::vector<std::unique_ptr<Operation> > _operations;
uint32_t _approxSize;
};