Fix concept requirements (#2513)

* Fix warnings from gcc-12 * Use auto
FEniCS · Jan 23, 2023 · 8177090 · 8177090
1 parent 8d55f95
commit 8177090
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/cpp/dolfinx/fem/utils.h b/cpp/dolfinx/fem/utils.h
@@ -601,12 +601,13 @@ void pack(std::span<T> coeffs, std::int32_t cell, int bs, std::span<const T> v,
 /// @private
 /// @brief  Concepts for function that returns cell index
 template <typename F>
-concept FetchCells = requires(F&& f, std::span<const std::int32_t> v) {
-                       std::invocable<F, std::span<const std::int32_t>>;
-                       {
-                         f(v)
-                         } -> std::convertible_to<std::int32_t>;
-                     };
+concept FetchCells
+    = requires(F&& f, std::span<const std::int32_t> v) {
+        requires std::invocable<F, std::span<const std::int32_t>>;
+        {
+          f(v)
+          } -> std::convertible_to<std::int32_t>;
+      };
 
 /// @brief Pack a single coefficient for a set of active entities.
 ///
@@ -769,7 +770,7 @@ void pack_coefficients(const Form<T>& form, IntegralType integral_type, int id,
     {
     case IntegralType::cell:
     {
-      auto fetch_cell = [](auto& entity) { return entity.front(); };
+      auto fetch_cell = [](auto entity) { return entity.front(); };
       const std::vector<std::int32_t>& cells = form.cell_domains(id);
 
       // Iterate over coefficients
@@ -786,7 +787,7 @@ void pack_coefficients(const Form<T>& form, IntegralType integral_type, int id,
       const std::vector<std::int32_t>& facets = form.exterior_facet_domains(id);
 
       // Function to fetch cell index from exterior facet entity
-      auto fetch_cell = [](auto& entity) { return entity.front(); };
+      auto fetch_cell = [](auto entity) { return entity.front(); };
 
       // Iterate over coefficients
       for (std::size_t coeff = 0; coeff < coefficients.size(); ++coeff)
@@ -802,8 +803,8 @@ void pack_coefficients(const Form<T>& form, IntegralType integral_type, int id,
       const std::vector<std::int32_t>& facets = form.interior_facet_domains(id);
 
       // Functions to fetch cell indices from interior facet entity
-      auto fetch_cell0 = [](auto& entity) { return entity[0]; };
-      auto fetch_cell1 = [](auto& entity) { return entity[2]; };
+      auto fetch_cell0 = [](auto entity) { return entity[0]; };
+      auto fetch_cell1 = [](auto entity) { return entity[2]; };
 
       // Iterate over coefficients
       for (std::size_t coeff = 0; coeff < coefficients.size(); ++coeff)

diff --git a/cpp/dolfinx/graph/AdjacencyList.h b/cpp/dolfinx/graph/AdjacencyList.h
@@ -169,7 +169,7 @@ class AdjacencyList
 template <typename U>
   requires requires {
              typename std::decay_t<U>::value_type;
-             std::convertible_to<
+             requires std::convertible_to<
                  U, std::vector<typename std::decay_t<U>::value_type>>;
            }
 AdjacencyList<typename std::decay_t<U>::value_type>