From 7821251c79cf381fe11bc1ce9242e65836376e2f Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 1 Jul 2011 03:36:17 +0000 Subject: [PATCH] Avoid accessing elements past the end. git-svn-id: https://svn.dealii.org/trunk@23902 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/grid/grid_generator.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/deal.II/source/grid/grid_generator.cc b/deal.II/source/grid/grid_generator.cc index 08df26b1e6..0bf9d67358 100644 --- a/deal.II/source/grid/grid_generator.cc +++ b/deal.II/source/grid/grid_generator.cc @@ -1820,10 +1820,11 @@ void GridGenerator::truncated_cone (Triangulation<3> &triangulation, const double half_length) { // Determine number of cells and vertices - const unsigned int n_cells = static_cast(std::floor (half_length / - std::max (radius_0, - radius_1) + - 0.5)); + const unsigned int + n_cells = static_cast(std::floor (half_length / + std::max (radius_0, + radius_1) + + 0.5)); const unsigned int n_vertices = 4 * (n_cells + 1); std::vector > vertices_tmp(n_vertices); @@ -1849,7 +1850,8 @@ void GridGenerator::truncated_cone (Triangulation<3> &triangulation, Point<3> (dx, 0, 0.5 * (radius_1 - radius_0) * dx / half_length); } - const std::vector > vertices (&vertices_tmp[0], &vertices_tmp[n_vertices]); + const std::vector > vertices (vertices_tmp.begin(), + vertices_tmp.end()); Table<2,unsigned int> cell_vertices(n_cells,GeometryInfo<3>::vertices_per_cell); for (unsigned int i = 0; i < n_cells; ++i) -- 2.39.5