Pass by value instead of rvalue ref

lindsayad · lindsayad · commit eaa757fb7de7 · 2024-07-02T06:50:33.000-07:00
This ensures the move constructor is invoked and the caller releases ownership per https://stackoverflow.com/a/71930927
diff --git a/include/numerics/numeric_vector.h b/include/numerics/numeric_vector.h
@@ -749,7 +749,7 @@ class NumericVector : public ReferenceCountedObject<NumericVector<T>>,
    * rows.  This  is currently only implemented for
    * PetscVectors.
    */
-  virtual void restore_subvector(std::unique_ptr<NumericVector<T>> &&,
+  virtual void restore_subvector(std::unique_ptr<NumericVector<T>>,
                                  const std::vector<numeric_index_type> &)
   {
     libmesh_not_implemented();
diff --git a/include/numerics/petsc_vector.h b/include/numerics/petsc_vector.h
@@ -349,7 +349,7 @@ class PetscVector final : public NumericVector<T>
   virtual std::unique_ptr<NumericVector<T>>
   get_subvector(const std::vector<numeric_index_type> & rows) override;
 
-  virtual void restore_subvector(std::unique_ptr<NumericVector<T>> && subvector,
+  virtual void restore_subvector(std::unique_ptr<NumericVector<T>> subvector,
                                  const std::vector<numeric_index_type> & rows) override;
 
 private:
diff --git a/src/numerics/petsc_vector.C b/src/numerics/petsc_vector.C
@@ -1433,7 +1433,7 @@ PetscVector<T>::get_subvector(const std::vector<numeric_index_type> & rows)
 
 template <typename T>
 void
-PetscVector<T>::restore_subvector(std::unique_ptr<NumericVector<T>> && subvector,
+PetscVector<T>::restore_subvector(std::unique_ptr<NumericVector<T>> subvector,
                                   const std::vector<numeric_index_type> & rows)
 {
   auto * const petsc_subvector = cast_ptr<PetscVector<T> *>(subvector.get());

Original file line number	Diff line number	Diff line change
`@@ -749,7 +749,7 @@ class NumericVector : public ReferenceCountedObject<NumericVector<T>>,`
`749`	`749`	`* rows. This is currently only implemented for`
`750`	`750`	`* PetscVectors.`
`751`	`751`	`*/`
`752`		`- virtual void restore_subvector(std::unique_ptr<NumericVector<T>> &&,`
	`752`	`+ virtual void restore_subvector(std::unique_ptr<NumericVector<T>>,`
`753`	`753`	`const std::vector<numeric_index_type> &)`
`754`	`754`	`{`
`755`	`755`	`libmesh_not_implemented();`
Original file line number	Diff line number	Diff line change
`@@ -1433,7 +1433,7 @@ PetscVector<T>::get_subvector(const std::vector<numeric_index_type> & rows)`
`1433`	`1433`
`1434`	`1434`	`template <typename T>`
`1435`	`1435`	`void`
`1436`		`-PetscVector<T>::restore_subvector(std::unique_ptr<NumericVector<T>> && subvector,`
	`1436`	`+PetscVector<T>::restore_subvector(std::unique_ptr<NumericVector<T>> subvector,`
`1437`	`1437`	`const std::vector<numeric_index_type> & rows)`
`1438`	`1438`	`{`
`1439`	`1439`	`auto * const petsc_subvector = cast_ptr<PetscVector<T> *>(subvector.get());`