Merge pull request #5205 from bangerth/array

Replace use of C-style array by std::array.
geodynamics · Jul 8, 2023 · 67de9f6 · 67de9f6
2 parents 056b05b + 75f00cc
commit 67de9f6
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/include/aspect/compat.h b/include/aspect/compat.h
@@ -52,7 +52,7 @@ namespace dealii
       template <int dim>
       struct VectorDoFTuple
       {
-        types::global_dof_index dof_indices[dim];
+        std::array<types::global_dof_index,dim> dof_indices;
 
         VectorDoFTuple()
         {
@@ -64,28 +64,19 @@ namespace dealii
         bool
         operator<(const VectorDoFTuple<dim> &other) const
         {
-          for (unsigned int i = 0; i < dim; ++i)
-            if (dof_indices[i] < other.dof_indices[i])
-              return true;
-            else if (dof_indices[i] > other.dof_indices[i])
-              return false;
-          return false;
+          return (dof_indices < other.dof_indices);
         }
 
         bool
         operator==(const VectorDoFTuple<dim> &other) const
         {
-          for (unsigned int i = 0; i < dim; ++i)
-            if (dof_indices[i] != other.dof_indices[i])
-              return false;
-
-          return true;
+          return (dof_indices == other.dof_indices);
         }
 
         bool
         operator!=(const VectorDoFTuple<dim> &other) const
         {
-          return !(*this == other);
+          return (dof_indices != other.dof_indices);
         }
       };