From: Wolfgang Bangerth Date: Sun, 13 Aug 2017 00:13:06 +0000 (-0600) Subject: Minor test cleanups. X-Git-Tag: v9.0.0-rc1~1282^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4805%2Fhead;p=dealii.git Minor test cleanups. --- diff --git a/include/deal.II/distributed/grid_tools.h b/include/deal.II/distributed/grid_tools.h index 41950701ee..fdd04ea8c1 100644 --- a/include/deal.II/distributed/grid_tools.h +++ b/include/deal.II/distributed/grid_tools.h @@ -201,12 +201,13 @@ namespace parallel constexpr int spacedim = MeshType::space_dimension; auto tria = static_cast*>(&mesh.get_triangulation()); - Assert(tria != NULL, ExcMessage("The function exchange_cell_data_to_ghosts only works with parallel Triangulations.")); + Assert (tria != null_ptr, + ExcMessage("The function exchange_cell_data_to_ghosts() only works with parallel triangulations.")); // map neighbor_id -> data_buffer where we accumulate the data to send typedef std::map > - cellmap_t; - cellmap_t destination_to_data_buffer; + DestinationToBufferMap; + DestinationToBufferMap destination_to_data_buffer_map; std::map > vertices_with_ghost_neighbors = tria->compute_vertices_with_ghost_neighbors(); @@ -247,9 +248,9 @@ namespace parallel // find the data buffer for proc "subdomain" if it exists // or create an empty one otherwise - typename cellmap_t::iterator p - = destination_to_data_buffer.insert (std::make_pair(subdomain, - internal::CellDataTransferBuffer())) + typename DestinationToBufferMap::iterator p + = destination_to_data_buffer_map.insert (std::make_pair(subdomain, + internal::CellDataTransferBuffer())) .first; p->second.cell_ids.emplace_back(cellid); @@ -270,7 +271,7 @@ namespace parallel it!=ghost_owners.end(); ++it, ++idx) { - internal::CellDataTransferBuffer &data = destination_to_data_buffer[*it]; + internal::CellDataTransferBuffer &data = destination_to_data_buffer_map[*it]; // pack all the data into // the buffer for this