From: Peter Munch Date: Fri, 23 Aug 2019 05:08:41 +0000 (+0200) Subject: Rename settings_ to settings in distributed/tria.cc X-Git-Tag: v9.2.0-rc1~1193^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8627%2Fhead;p=dealii.git Rename settings_ to settings in distributed/tria.cc --- diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 58d00ebd91..33686a1186 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -2123,20 +2123,20 @@ namespace parallel MPI_Comm mpi_communicator, const typename dealii::Triangulation::MeshSmoothing smooth_grid, - const Settings settings_) + const Settings settings) : // Do not check for distorted cells. // For multigrid, we need limit_level_difference_at_vertices // to make sure the transfer operators only need to consider two levels. dealii::parallel::DistributedTriangulationBase( mpi_communicator, - (settings_ & construct_multigrid_hierarchy) ? + (settings & construct_multigrid_hierarchy) ? static_cast< typename dealii::Triangulation::MeshSmoothing>( smooth_grid | Triangulation::limit_level_difference_at_vertices) : smooth_grid, false) - , settings(settings_) + , settings(settings) , triangulation_has_content(false) , connectivity(nullptr) , parallel_forest(nullptr)