From: Kainan Wang Date: Mon, 15 Apr 2013 09:14:33 +0000 (+0000) Subject: Fix some warnings X-Git-Tag: v8.0.0~316^2~47 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c81471f223457ac530ea35bbe82dbe9ef99533;p=dealii.git Fix some warnings git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29273 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/compressed_set_sparsity_pattern.h b/deal.II/include/deal.II/lac/compressed_set_sparsity_pattern.h index 4f0379a53b..adb57ca87a 100644 --- a/deal.II/include/deal.II/lac/compressed_set_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/compressed_set_sparsity_pattern.h @@ -463,8 +463,8 @@ void CompressedSetSparsityPattern::add (const size_type i, const size_type j) { - Assert (i(i, 0, rows)); + Assert (j(j, 0, cols)); lines[i].add (j); } @@ -479,7 +479,7 @@ CompressedSetSparsityPattern::add_entries (const size_type row, ForwardIterator end, const bool /*indices_are_sorted*/) { - Assert (row < rows, ExcIndexRange (row, 0, rows)); + Assert (row < rows, ExcIndexRangeType (row, 0, rows)); lines[row].add_entries (begin, end); } @@ -490,7 +490,7 @@ inline CompressedSetSparsityPattern::size_type CompressedSetSparsityPattern::row_length (const size_type row) const { - Assert (row < n_rows(), ExcIndexRange (row, 0, n_rows())); + Assert (row < n_rows(), ExcIndexRangeType (row, 0, n_rows())); return lines[row].entries.size(); } diff --git a/deal.II/include/deal.II/lac/matrix_block.h b/deal.II/include/deal.II/lac/matrix_block.h index 70d3b4f103..5821861662 100644 --- a/deal.II/include/deal.II/lac/matrix_block.h +++ b/deal.II/include/deal.II/lac/matrix_block.h @@ -351,14 +351,14 @@ public: * position of the data member * matrix on the global matrix. */ - size_type row; + unsigned int row; /** * Column coordinate. This is * the position of the data * member matrix on the global * matrix. */ - size_type column; + unsigned int column; /** * The matrix itself