Use std::move() to enable move-constructor when setting up argument to

vespalib::eval::ValueType::tensor_type().

Argument to std::move() should never be const.

5 files changed, 5 insertions, 5 deletions

diff --git a/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_address_combiner.cpp b/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_address_combiner.cpp
index 1a3780b8f66..53af60bd101 100644
--- a/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_address_combiner.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_address_combiner.cpp
@@ -116,7 +116,7 @@ DenseTensorAddressCombiner::combineDimensions(const eval::ValueType &lhs,
     }
     return (result.empty() ?
             eval::ValueType::double_type() :
-            eval::ValueType::tensor_type(result));
+            eval::ValueType::tensor_type(std::move(result)));
 }
 
 } // namespace vespalib::tensor
diff --git a/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_builder.cpp b/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_builder.cpp
index d5e6feb2135..fe626e626cc 100644
--- a/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_builder.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/dense/dense_tensor_builder.cpp
@@ -38,7 +38,7 @@ validateLabelNotSpecified(size_t oldLabel, const vespalib::string &dimension)
 }
 
 eval::ValueType
-makeValueType(const std::vector<eval::ValueType::Dimension> &&dimensions) {
+makeValueType(std::vector<eval::ValueType::Dimension> &&dimensions) {
     return (dimensions.empty() ?
             eval::ValueType::double_type() :
             eval::ValueType::tensor_type(std::move(dimensions)));
diff --git a/vespalib/src/vespa/vespalib/tensor/serialization/dense_binary_format.cpp b/vespalib/src/vespa/vespalib/tensor/serialization/dense_binary_format.cpp
index 0f6d1b3b2a5..a3fddafe8f5 100644
--- a/vespalib/src/vespa/vespalib/tensor/serialization/dense_binary_format.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/serialization/dense_binary_format.cpp
@@ -14,7 +14,7 @@ namespace tensor {
 namespace {
 
 eval::ValueType
-makeValueType(const std::vector<eval::ValueType::Dimension> &&dimensions) {
+makeValueType(std::vector<eval::ValueType::Dimension> &&dimensions) {
     return (dimensions.empty() ?
             eval::ValueType::double_type() :
             eval::ValueType::tensor_type(std::move(dimensions)));
diff --git a/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor.cpp b/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor.cpp
index ce7369e1aa0..24c48bfb92c 100644
--- a/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor.cpp
@@ -92,7 +92,7 @@ SparseTensor::combineDimensionsWith(const SparseTensor &rhs) const
                    { return lhsDim.name < rhsDim.name; });
     return (result.empty() ?
             eval::ValueType::double_type() :
-            eval::ValueType::tensor_type(result));
+            eval::ValueType::tensor_type(std::move(result)));
 }
 
 eval::ValueType
diff --git a/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor_builder.cpp b/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor_builder.cpp
index e9660665531..2c022f6f0c2 100644
--- a/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor_builder.cpp
+++ b/vespalib/src/vespa/vespalib/tensor/sparse/sparse_tensor_builder.cpp
@@ -36,7 +36,7 @@ SparseTensorBuilder::makeType()
     }
     _type = (dimensions.empty() ?
              eval::ValueType::double_type() :
-             eval::ValueType::tensor_type(dimensions));
+             eval::ValueType::tensor_type(std::move(dimensions)));
     _type_made = true;
 }