From db0aaaf064ff7f90f762db9b861c340ab19cbcc6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Sat, 7 Dec 2013 17:39:54 +0000 Subject: [PATCH] Convert a couple of places where we intended 'unsigned int' but now had 'size_type'. git-svn-id: https://svn.dealii.org/trunk@31918 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/lac/matrix_out.h | 22 +++++++++++----------- deal.II/source/lac/matrix_out.cc | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deal.II/include/deal.II/lac/matrix_out.h b/deal.II/include/deal.II/lac/matrix_out.h index 9916e7a45c..2f30fdc684 100644 --- a/deal.II/include/deal.II/lac/matrix_out.h +++ b/deal.II/include/deal.II/lac/matrix_out.h @@ -134,7 +134,7 @@ public: * * Default value is one. */ - size_type block_size; + unsigned int block_size; /** * If true, plot @@ -149,9 +149,9 @@ public: * structure to their default * values. */ - Options (const bool show_absolute_values = false, - const size_type block_size = 1, - const bool discontinuous = false); + Options (const bool show_absolute_values = false, + const unsigned int block_size = 1, + const bool discontinuous = false); }; /** @@ -365,7 +365,7 @@ MatrixOut::get_gridpoint_value (const Matrix &matrix, return std::fabs(get_element (matrix, i, j)); else return get_element (matrix, i, j); - }; + } // if blocksize greater than one, // then compute average of elements @@ -394,12 +394,12 @@ MatrixOut::build_patches (const Matrix &matrix, const Options options) { size_type - gridpoints_x = (matrix.n() / options.block_size - + - (matrix.n() % options.block_size != 0 ? 1 : 0)), - gridpoints_y = (matrix.m() / options.block_size - + - (matrix.m() % options.block_size != 0 ? 1 : 0)); + gridpoints_x = (matrix.n() / options.block_size + + + (matrix.n() % options.block_size != 0 ? 1 : 0)), + gridpoints_y = (matrix.m() / options.block_size + + + (matrix.m() % options.block_size != 0 ? 1 : 0)); // If continuous, the number of // plotted patches is matrix size-1 diff --git a/deal.II/source/lac/matrix_out.cc b/deal.II/source/lac/matrix_out.cc index 634d5dd7f9..abfe4f1116 100644 --- a/deal.II/source/lac/matrix_out.cc +++ b/deal.II/source/lac/matrix_out.cc @@ -19,9 +19,9 @@ DEAL_II_NAMESPACE_OPEN -MatrixOut::Options::Options (const bool show_absolute_values, - const size_type block_size, - const bool discontinuous) +MatrixOut::Options::Options (const bool show_absolute_values, + const unsigned int block_size, + const bool discontinuous) : show_absolute_values (show_absolute_values), block_size (block_size), -- 2.39.5