From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Wed, 21 Jun 2023 15:35:56 +0000 (-0600)
Subject: Rename a lambda function and make it easier to read.
X-Git-Tag: relicensing~852^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15416%2Fhead;p=dealii.git

Rename a lambda function and make it easier to read.

The function is currently called 'sort_constraints()', but it also makes
the elements of a vector unique. So call it 'sort_and_make_unique()'
instead.

More importantly, though, the function operates on a vector that it captures
by reference. That makes it hard to read at the place where it is called what
it works on. Make this more obvious by letting it take the object it works on
as an argument.
---

diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h
index f385c04284..bfda083cc1 100644
--- a/include/deal.II/lac/affine_constraints.templates.h
+++ b/include/deal.II/lac/affine_constraints.templates.h
@@ -218,15 +218,13 @@ namespace internal
       Utilities::MPI::this_mpi_process(mpi_communicator);
 
     // helper function
-    const auto sort_constraints = [&]() {
-      std::sort(locally_relevant_constraints.begin(),
-                locally_relevant_constraints.end());
-
-      locally_relevant_constraints.erase(
-        std::unique(locally_relevant_constraints.begin(),
-                    locally_relevant_constraints.end()),
-        locally_relevant_constraints.end());
-    };
+    const auto sort_and_make_unique =
+      [](std::vector<ConstraintType> &constraints) {
+        std::sort(constraints.begin(), constraints.end());
+
+        constraints.erase(std::unique(constraints.begin(), constraints.end()),
+                          constraints.end());
+      };
 
     // 0) collect constrained indices of the current object
     IndexSet constrained_indices(locally_owned_dofs.size());
@@ -352,7 +350,7 @@ namespace internal
         MPI_Waitall(requests.size(), requests.data(), MPI_STATUSES_IGNORE);
       AssertThrowMPI(ierr);
 
-      sort_constraints();
+      sort_and_make_unique(locally_relevant_constraints);
     }
 
     // step 3: communicate constraints so that each process know how the
@@ -472,7 +470,7 @@ namespace internal
         MPI_Waitall(requests.size(), requests.data(), MPI_STATUSES_IGNORE);
       AssertThrowMPI(ierr);
 
-      sort_constraints();
+      sort_and_make_unique(locally_relevant_constraints);
     }
 
 #endif