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 4f0379a53b6946d7878cf15c4690882e4a123c6b..adb57ca87a09f8b57ca17706c705dc4840159978 100644 (file)
--- 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<rows, ExcIndexRange(i, 0, rows));
-  Assert (j<cols, ExcIndexRange(j, 0, cols));
+  Assert (i<rows, ExcIndexRangeType<size_type>(i, 0, rows));
+  Assert (j<cols, ExcIndexRangeType<size_type>(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<size_type> (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<size_type> (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 70d3b4f1031804c7bacc024f79647df188a4b8c8..582186166250556703119cf24386f64ec7ea8387 100644 (file)
--- 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