From: kainan.wang Date: Sun, 14 Apr 2013 20:22:50 +0000 (+0000) Subject: Fix some warnings X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=854c2fa554629d13ee2452d9c2a473b61e384ffa;p=dealii-svn.git Fix some warnings git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29270 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/lac/block_vector_base.h b/deal.II/include/deal.II/lac/block_vector_base.h index b2fdf6919b..a5222ad5ea 100644 --- a/deal.II/include/deal.II/lac/block_vector_base.h +++ b/deal.II/include/deal.II/lac/block_vector_base.h @@ -627,7 +627,7 @@ namespace internal * element presently pointed * to. */ - size_type current_block; + unsigned int current_block; size_type index_within_block; /** @@ -804,13 +804,13 @@ public: * Access to a single block. */ BlockType & - block (const size_type i); + block (const unsigned int i); /** * Read-only access to a single block. */ const BlockType & - block (const size_type i) const; + block (const unsigned int i) const; /** * Return a reference on the @@ -1786,7 +1786,7 @@ BlockVectorBase::n_blocks () const template inline typename BlockVectorBase::BlockType & -BlockVectorBase::block (const size_type i) +BlockVectorBase::block (const unsigned int i) { Assert(i::block (const size_type i) template inline const typename BlockVectorBase::BlockType & -BlockVectorBase::block (const size_type i) const +BlockVectorBase::block (const unsigned int i) const { Assert(i(i, 0, rows)); + Assert (j(j, 0, cols)); lines[i].add (j); } @@ -564,7 +564,7 @@ inline types::global_dof_index CompressedSparsityPattern::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())); if (lines[row].cache_entries != 0) lines[row].flush_cache (); @@ -578,9 +578,9 @@ types::global_dof_index CompressedSparsityPattern::column_number (const size_type row, const size_type index) const { - Assert (row < n_rows(), ExcIndexRange (row, 0, n_rows())); + Assert (row < n_rows(), ExcIndexRangeType (row, 0, n_rows())); Assert (index < lines[row].entries.size(), - ExcIndexRange (index, 0, lines[row].entries.size())); + ExcIndexRangeType (index, 0, lines[row].entries.size())); if (lines[row].cache_entries != 0) lines[row].flush_cache (); @@ -593,7 +593,7 @@ inline CompressedSparsityPattern::row_iterator CompressedSparsityPattern::row_begin (const size_type row) const { - Assert (row < n_rows(), ExcIndexRange (row, 0, n_rows())); + Assert (row < n_rows(), ExcIndexRangeType (row, 0, n_rows())); if (lines[row].cache_entries != 0) lines[row].flush_cache (); @@ -606,7 +606,7 @@ inline CompressedSparsityPattern::row_iterator CompressedSparsityPattern::row_end (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.end(); } diff --git a/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h b/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h index 515eae350e..25d9482c09 100644 --- a/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h +++ b/deal.II/include/deal.II/lac/trilinos_sparsity_pattern.h @@ -1560,7 +1560,7 @@ namespace TrilinosWrappers SparsityPattern::const_iterator SparsityPattern::begin(const size_type r) const { - Assert (r < n_rows(), ExcIndexRange(r, 0, n_rows())); + Assert (r < n_rows(), ExcIndexRangeType(r, 0, n_rows())); if (row_length(r) > 0) return const_iterator(this, r, 0); else @@ -1573,7 +1573,7 @@ namespace TrilinosWrappers SparsityPattern::const_iterator SparsityPattern::end(const size_type r) const { - Assert (r < n_rows(), ExcIndexRange(r, 0, n_rows())); + Assert (r < n_rows(), ExcIndexRangeType(r, 0, n_rows())); // place the iterator on the first entry // past this line, or at the end of the