From: Peter Munch <peterrmuench@gmail.com>
Date: Sun, 10 May 2020 05:13:18 +0000 (+0200)
Subject: Fix ICC compilation
X-Git-Tag: v9.2.0-rc1~55^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92189515988f28597449f9ffa5c65a7410dac927;p=dealii.git

Fix ICC compilation
---

diff --git a/include/deal.II/matrix_free/mapping_info.templates.h b/include/deal.II/matrix_free/mapping_info.templates.h
index 00b2f3f19f..e2a97c8b5c 100644
--- a/include/deal.II/matrix_free/mapping_info.templates.h
+++ b/include/deal.II/matrix_free/mapping_info.templates.h
@@ -565,15 +565,17 @@ namespace internal
       /**
        * Helper function called internally during the initialize function.
        */
-      template <int dim, typename Number, typename VectorizedArrayType>
+      template <int dim, typename VectorizedArrayType>
       void
       evaluate_on_cell(const dealii::Triangulation<dim> &           tria,
                        const std::pair<unsigned int, unsigned int> *cells,
                        const unsigned int                           my_q,
                        GeometryType &                               cell_t_prev,
-                       GeometryType (&cell_t)[VectorizedArrayType::size()],
+                       GeometryType *                               cell_t,
                        dealii::FEValues<dim, dim> &                 fe_val,
-                       LocalData<dim, Number, VectorizedArrayType> &cell_data)
+                       LocalData<dim,
+                                 typename VectorizedArrayType::value_type,
+                                 VectorizedArrayType> &             cell_data)
       {
         const unsigned int n_q_points   = fe_val.n_quadrature_points;
         const UpdateFlags  update_flags = fe_val.get_update_flags();
@@ -845,14 +847,13 @@ namespace internal
                        active_fe_index[cell] != active_fe_index[cell - 1])
                 cell_t_prev = general;
 
-              evaluate_on_cell<dim, Number, VectorizedArrayType>(
-                tria,
-                &cells[cell * VectorizedArrayType::size()],
-                my_q,
-                cell_t_prev,
-                cell_t,
-                fe_val,
-                cell_data);
+              evaluate_on_cell(tria,
+                               &cells[cell * VectorizedArrayType::size()],
+                               my_q,
+                               cell_t_prev,
+                               cell_t,
+                               fe_val,
+                               cell_data);
 
               // now reorder the data into vectorized types. if we are here
               // for the first time, we need to find out whether the Jacobian