From: Jean-Paul Pelteret <jppelteret@gmail.com>
Date: Wed, 5 Jan 2022 19:05:20 +0000 (+0100)
Subject: Make FEInterfaceValues compatible with filtered iterators
X-Git-Tag: v9.4.0-rc1~667^2~2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=914101b2ac732bab3d625b22723ff40f4d9cb6fe;p=dealii.git

Make FEInterfaceValues compatible with filtered iterators
---

diff --git a/include/deal.II/fe/fe_interface_values.h b/include/deal.II/fe/fe_interface_values.h
index fe4e925793..bba456d6ea 100644
--- a/include/deal.II/fe/fe_interface_values.h
+++ b/include/deal.II/fe/fe_interface_values.h
@@ -1405,14 +1405,14 @@ public:
    * @param[in] sub_face_no_neighbor Like `sub_face_no`, just for the
    *   neighboring cell.
    */
-  template <class CellIteratorType>
+  template <class CellIteratorType, class CellNeighborIteratorType>
   void
-  reinit(const CellIteratorType &                         cell,
-         const unsigned int                               face_no,
-         const unsigned int                               sub_face_no,
-         const typename identity<CellIteratorType>::type &cell_neighbor,
-         const unsigned int                               face_no_neighbor,
-         const unsigned int                               sub_face_no_neighbor);
+  reinit(const CellIteratorType &        cell,
+         const unsigned int              face_no,
+         const unsigned int              sub_face_no,
+         const CellNeighborIteratorType &cell_neighbor,
+         const unsigned int              face_no_neighbor,
+         const unsigned int              sub_face_no_neighbor);
 
   /**
    * Re-initialize this object to be used on an interface given by a single face
@@ -2028,15 +2028,15 @@ FEInterfaceValues<dim, spacedim>::FEInterfaceValues(
 
 
 template <int dim, int spacedim>
-template <class CellIteratorType>
+template <class CellIteratorType, class CellNeighborIteratorType>
 void
 FEInterfaceValues<dim, spacedim>::reinit(
-  const CellIteratorType &                         cell,
-  const unsigned int                               face_no,
-  const unsigned int                               sub_face_no,
-  const typename identity<CellIteratorType>::type &cell_neighbor,
-  const unsigned int                               face_no_neighbor,
-  const unsigned int                               sub_face_no_neighbor)
+  const CellIteratorType &        cell,
+  const unsigned int              face_no,
+  const unsigned int              sub_face_no,
+  const CellNeighborIteratorType &cell_neighbor,
+  const unsigned int              face_no_neighbor,
+  const unsigned int              sub_face_no_neighbor)
 {
   if (sub_face_no == numbers::invalid_unsigned_int)
     {