diff options
author | Arne Juul <arnej@verizonmedia.com> | 2020-10-15 11:29:37 +0000 |
---|---|---|
committer | Arne Juul <arnej@verizonmedia.com> | 2020-10-15 11:29:37 +0000 |
commit | 1210a91e2861882ba25187db1f239da78474deeb (patch) | |
tree | 013b319de167871ce5450b6166a370785eba49cc | |
parent | 740ead4c0de7533a7ff27186d1e608a87ad4b7b7 (diff) |
use "return {};" to return empty unique_ptr
7 files changed, 7 insertions, 7 deletions
diff --git a/document/src/vespa/document/update/tensor_add_update.cpp b/document/src/vespa/document/update/tensor_add_update.cpp index 91b72329994..9a89c9850e6 100644 --- a/document/src/vespa/document/update/tensor_add_update.cpp +++ b/document/src/vespa/document/update/tensor_add_update.cpp @@ -109,7 +109,7 @@ TensorAddUpdate::applyTo(const vespalib::eval::Value &tensor) const return old_add(&tensor, addTensor); } } - return std::unique_ptr<vespalib::eval::Value>(); + return {}; } bool diff --git a/document/src/vespa/document/update/tensor_modify_update.cpp b/document/src/vespa/document/update/tensor_modify_update.cpp index 292b4165540..044c5a14298 100644 --- a/document/src/vespa/document/update/tensor_modify_update.cpp +++ b/document/src/vespa/document/update/tensor_modify_update.cpp @@ -185,7 +185,7 @@ TensorModifyUpdate::applyTo(const vespalib::eval::Value &tensor) const return old_modify(&tensor, cellsTensor, getJoinFunction(_operation)); } } - return std::unique_ptr<vespalib::eval::Value>(); + return {}; } bool diff --git a/document/src/vespa/document/update/tensor_remove_update.cpp b/document/src/vespa/document/update/tensor_remove_update.cpp index 178bd1bd950..1270e430750 100644 --- a/document/src/vespa/document/update/tensor_remove_update.cpp +++ b/document/src/vespa/document/update/tensor_remove_update.cpp @@ -129,7 +129,7 @@ TensorRemoveUpdate::applyTo(const vespalib::eval::Value &tensor) const return old_remove(&tensor, addressTensor); } } - return std::unique_ptr<vespalib::eval::Value>(); + return {}; } bool diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp index 8bd276e7dd9..8b27dcc1cd4 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute.cpp @@ -168,7 +168,7 @@ DenseTensorAttribute::getTensor(DocId docId) const ref = _refVector[docId]; } if (!ref.valid()) { - return std::unique_ptr<vespalib::eval::Value>(); + return {}; } return _denseTensorStore.getTensor(ref); } diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp index e76cea53c12..1abc3800d97 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp @@ -131,7 +131,7 @@ std::unique_ptr<Value> DenseTensorStore::getTensor(EntryRef ref) const { if (!ref.valid()) { - return std::unique_ptr<Value>(); + return {}; } vespalib::eval::TypedCells cells_ref(getRawBuffer(ref), _type.cell_type(), getNumCells()); return std::make_unique<vespalib::tensor::DenseTensorView>(_type, cells_ref); diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_attribute.cpp index fc63969e548..de6feb80958 100644 --- a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_attribute.cpp +++ b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_attribute.cpp @@ -50,7 +50,7 @@ SerializedTensorAttribute::getTensor(DocId docId) const ref = _refVector[docId]; } if (!ref.valid()) { - return std::unique_ptr<Value>(); + return {}; } return _serializedTensorStore.getTensor(ref); } diff --git a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp index 4215df9e270..b34ba752680 100644 --- a/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/serialized_tensor_store.cpp @@ -91,7 +91,7 @@ SerializedTensorStore::getTensor(EntryRef ref) const { auto raw = getRawBuffer(ref); if (raw.second == 0u) { - return std::unique_ptr<Value>(); + return {}; } return deserialize_tensor(raw.first, raw.second); } |