From: Daniel Arndt <arndtd@ornl.gov>
Date: Sat, 19 Sep 2020 16:12:11 +0000 (-0400)
Subject: Avoid gcc-10 warning about deprecated parallel::Triangulation
X-Git-Tag: v9.3.0-rc1~1100^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5df0977d3f88e20800d329a2dd7c319e452e58ba;p=dealii.git

Avoid gcc-10 warning about deprecated parallel::Triangulation
---

diff --git a/include/deal.II/distributed/cell_weights.h b/include/deal.II/distributed/cell_weights.h
index 6066e30995..1ecfad304a 100644
--- a/include/deal.II/distributed/cell_weights.h
+++ b/include/deal.II/distributed/cell_weights.h
@@ -137,8 +137,8 @@ namespace parallel
      * Triangulation associated with the @p dof_handler.
      */
     static std::function<unsigned int(
-      const typename Triangulation<dim, spacedim>::cell_iterator &cell,
-      const typename Triangulation<dim, spacedim>::CellStatus     status)>
+      const typename dealii::Triangulation<dim, spacedim>::cell_iterator &cell,
+      const typename dealii::Triangulation<dim, spacedim>::CellStatus status)>
     make_weighting_callback(const DoFHandler<dim, spacedim> &dof_handler,
                             const WeightingFunction &weighting_function);
 
diff --git a/source/distributed/cell_weights.cc b/source/distributed/cell_weights.cc
index fb8dfff2bc..c6d052f59a 100644
--- a/source/distributed/cell_weights.cc
+++ b/source/distributed/cell_weights.cc
@@ -126,8 +126,8 @@ namespace parallel
 
   template <int dim, int spacedim>
   std::function<unsigned int(
-    const typename Triangulation<dim, spacedim>::cell_iterator &cell,
-    const typename Triangulation<dim, spacedim>::CellStatus     status)>
+    const typename dealii::Triangulation<dim, spacedim>::cell_iterator &cell,
+    const typename dealii::Triangulation<dim, spacedim>::CellStatus     status)>
   CellWeights<dim, spacedim>::make_weighting_callback(
     const DoFHandler<dim, spacedim> &dof_handler,
     const typename CellWeights<dim, spacedim>::WeightingFunction
@@ -142,17 +142,19 @@ namespace parallel
       ExcMessage(
         "parallel::CellWeights requires a parallel::TriangulationBase object."));
 
-    return [&dof_handler, tria, weighting_function](
-             const typename Triangulation<dim, spacedim>::cell_iterator &cell,
-             const typename Triangulation<dim, spacedim>::CellStatus     status)
-             -> unsigned int {
-      return CellWeights<dim, spacedim>::weighting_callback(cell,
-                                                            status,
-                                                            std::cref(
-                                                              dof_handler),
-                                                            std::cref(*tria),
-                                                            weighting_function);
-    };
+    return
+      [&dof_handler, tria, weighting_function](
+        const typename dealii::Triangulation<dim, spacedim>::cell_iterator
+          &                                                             cell,
+        const typename dealii::Triangulation<dim, spacedim>::CellStatus status)
+        -> unsigned int {
+        return CellWeights<dim, spacedim>::weighting_callback(
+          cell,
+          status,
+          std::cref(dof_handler),
+          std::cref(*tria),
+          weighting_function);
+      };
   }