Fix const error in workspace vector copy constructor and copy assignment

awslabs · Feb 27, 2024 · 8e4148a · 8e4148a
1 parent c7242ac
commit 8e4148a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/extern/patch/mfem/patch_workspace_vectors.diff b/extern/patch/mfem/patch_workspace_vectors.diff
@@ -1068,10 +1068,10 @@ index 000000000..b5c0ebae8
 +   WorkspaceVector(WorkspaceVector &&other);
 +
 +   /// No copy constructor.
-+   WorkspaceVector(WorkspaceVector &other) = delete;
++   WorkspaceVector(const WorkspaceVector &other) = delete;
 +
 +   /// Copy assignment: copy contents of vector, not metadata.
-+   WorkspaceVector& operator=(WorkspaceVector &other)
++   WorkspaceVector& operator=(const WorkspaceVector &other)
 +   {
 +      Vector::operator=(other);
 +      return *this;

diff --git a/palace/linalg/chebyshev.cpp b/palace/linalg/chebyshev.cpp
@@ -221,7 +221,7 @@ void ChebyshevSmoother<OperType>::Mult(const VecType &x, VecType &y) const
     }
     else
     {
-      r.VecType::operator=(x);
+      r = x;
       y = 0.0;
     }
 
@@ -289,7 +289,7 @@ void ChebyshevSmoother1stKind<OperType>::Mult(const VecType &x, VecType &y) cons
     }
     else
     {
-      r.VecType::operator=(x);
+      r = x;
       y = 0.0;
     }
 

diff --git a/palace/linalg/iterative.cpp b/palace/linalg/iterative.cpp
@@ -380,7 +380,7 @@ void CgSolver<OperType>::Mult(const VecType &b, VecType &x) const
   }
   else
   {
-    r.VecType::operator=(b);
+    r = b;
     x = 0.0;
   }
   if (B)
@@ -389,7 +389,7 @@ void CgSolver<OperType>::Mult(const VecType &b, VecType &x) const
   }
   else
   {
-    z.VecType::operator=(r);
+    z = r;
   }
   beta = linalg::Dot(comm, z, r);
   CheckDot(beta, "PCG preconditioner is not positive definite: (Br, r) = ");
@@ -424,7 +424,7 @@ void CgSolver<OperType>::Mult(const VecType &b, VecType &x) const
     }
     if (!it)
     {
-      p.VecType::operator=(z);
+      p = z;
     }
     else
     {
@@ -446,7 +446,7 @@ void CgSolver<OperType>::Mult(const VecType &b, VecType &x) const
     }
     else
     {
-      z.VecType::operator=(r);
+      z = r;
     }
     beta = linalg::Dot(comm, z, r);
     CheckDot(beta, "PCG preconditioner is not positive definite: (Br, r) = ");
@@ -644,7 +644,7 @@ void GmresSolver<OperType>::Mult(const VecType &b, VecType &x) const
     }
     else  // B && pc_side == PrecSide::RIGHT
     {
-      r.VecType::operator=(0.0);
+      r = 0.0;
       for (int k = 0; k <= j; k++)
       {
         r.Add(s[k], V[k]);

diff --git a/palace/utils/workspace.hpp b/palace/utils/workspace.hpp
@@ -27,10 +27,10 @@ class ComplexWorkspaceVector : public ComplexVector
   }
 
   // No copy constructor.
-  ComplexWorkspaceVector(ComplexWorkspaceVector &other) = delete;
+  ComplexWorkspaceVector(const ComplexWorkspaceVector &other) = delete;
 
   // Copy assignment: copy contents of vector, not metadata.
-  ComplexWorkspaceVector &operator=(ComplexWorkspaceVector &other)
+  ComplexWorkspaceVector &operator=(const ComplexWorkspaceVector &other)
   {
     ComplexVector::operator=(other);
     return *this;