From: Wolfgang Bangerth Date: Thu, 19 Apr 2018 16:23:52 +0000 (-0600) Subject: Also change the naming of function arguments in the implementation. X-Git-Tag: v9.0.0-rc1~157^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F6271%2Fhead;p=dealii.git Also change the naming of function arguments in the implementation. --- diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 2d8e0844fc..ec773e0f52 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -816,7 +816,7 @@ namespace const typename Triangulation::cell_iterator &dealii_cell, const typename Triangulation::cell_iterator &parent_cell, const typename internal::p4est::types::quadrant &p4est_cell, - const unsigned int offset, + const unsigned int handle, const typename std::function< void(typename parallel::distributed::Triangulation::cell_iterator, typename parallel::distributed::Triangulation::CellStatus, void *) > &unpack_callback) @@ -863,7 +863,7 @@ namespace dealii_cell->child(c), dealii_cell, p4est_child[c], - offset, + handle, unpack_callback); } } @@ -876,7 +876,7 @@ namespace sc_array_index (const_cast(&tree.quadrants), idx) ); - void *ptr = static_cast(q->p.user_data) + offset; + void *ptr = static_cast(q->p.user_data) + handle; typename parallel::distributed::Triangulation::CellStatus status = * static_cast< typename parallel::distributed::Triangulation::CellStatus * @@ -3261,14 +3261,14 @@ namespace parallel template void Triangulation:: - notify_ready_to_unpack (const unsigned int offset, + notify_ready_to_unpack (const unsigned int handle, const std::function &unpack_callback) { - Assert (offset >= sizeof(CellStatus), + Assert (handle >= sizeof(CellStatus), ExcMessage ("Invalid offset.")); - Assert (offset < sizeof(CellStatus)+attached_data_size, + Assert (handle < sizeof(CellStatus)+attached_data_size, ExcMessage ("Invalid offset.")); Assert (n_attached_datas > 0, ExcMessage ("The notify_ready_to_unpack() has already been called " @@ -3298,7 +3298,7 @@ namespace parallel cell, cell, p4est_coarse_cell, - offset, + handle, unpack_callback); }