From: Wolfgang Bangerth Date: Thu, 18 Jul 2013 01:47:00 +0000 (+0000) Subject: Do conversion of iterators right, following Timo's patches today. X-Git-Tag: v8.0.0~92 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dc234c047c7764be0d8a5845337868327dee6e4;p=dealii.git Do conversion of iterators right, following Timo's patches today. git-svn-id: https://svn.dealii.org/trunk@30030 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/meshworker/dof_info.h b/deal.II/include/deal.II/meshworker/dof_info.h index 76f1679ce9..97f77841f8 100644 --- a/deal.II/include/deal.II/meshworker/dof_info.h +++ b/deal.II/include/deal.II/meshworker/dof_info.h @@ -313,7 +313,7 @@ namespace MeshWorker get_indices(c); level_cell = c->is_level_cell(); - cell = static_cast::cell_iterator> (c); + cell = typename Triangulation::cell_iterator(*c); face_number = deal_II_numbers::invalid_unsigned_int; sub_number = deal_II_numbers::invalid_unsigned_int; if (block_info) @@ -345,11 +345,11 @@ namespace MeshWorker const unsigned int face_no) { if ((cell.state() != IteratorState::valid) - || cell != static_cast::cell_iterator> (c)) + || cell != typename Triangulation::cell_iterator(*c)) get_indices(c); level_cell = c->is_level_cell(); - cell = static_cast::cell_iterator> (c); + cell = typename Triangulation::cell_iterator(*c); set_face(f,face_no); if (block_info)