From: Wolfgang Bangerth Date: Fri, 14 Aug 2015 17:37:29 +0000 (-0500) Subject: Fix warnings introduced by #212. X-Git-Tag: v8.4.0-rc2~601^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54b6c2295c475a0780b6e61add4e1b19a5507f6b;p=dealii.git Fix warnings introduced by #212. This fixes a few warnings introduced by the merge of #212 (the parallel::shared::Triangulation). --- diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc index 94b53abd0c..db6aa8ae99 100644 --- a/source/distributed/tria_base.cc +++ b/source/distributed/tria_base.cc @@ -50,7 +50,7 @@ namespace parallel n_subdomains(Utilities::MPI::n_mpi_processes(mpi_communicator)) { number_cache.n_locally_owned_active_cells.resize (n_subdomains); - }; + } template void diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index efc13fe743..8bc62e01e9 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -1026,10 +1026,9 @@ namespace internal (dynamic_cast*> (&dof_handler.get_tria ())); Assert(tr != 0, ExcInternalError()); const unsigned int n_cpu = Utilities::MPI::n_mpi_processes (tr->get_communicator ()); - const unsigned int this_process = - Utilities::MPI::this_mpi_process (tr->get_communicator ()); std::vector gathered_new_numbers (dof_handler.n_dofs (), 0); - Assert(this_process == dof_handler.get_tria ().locally_owned_subdomain (), + Assert(Utilities::MPI::this_mpi_process (tr->get_communicator ()) == + dof_handler.get_tria ().locally_owned_subdomain (), ExcInternalError()) //gather new numbers among processors into one vector @@ -1054,7 +1053,8 @@ namespace internal displs[i] = shift; shift += rcounts[i]; } - Assert(((int)new_numbers_copy.size()) == rcounts[this_process], + Assert(((int)new_numbers_copy.size()) == + rcounts[Utilities::MPI::this_mpi_process (tr->get_communicator ())], ExcInternalError()); MPI_Allgatherv (&new_numbers_copy[0], new_numbers_copy.size (), DEAL_II_DOF_INDEX_MPI_TYPE,