Fix type mismatch in block vector

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index d1022a3d5db7b219c2d148e0527d36795a5dfc03..539611ff6b7dabb2aad9e7ee4892646057b0301c 100644 (file)
--- a/include/deal.II/lac/block_indices.h
+++ b/include/deal.II/lac/block_indices.h
@@ -303,8 +303,8 @@ BlockIndices::global_to_local (const size_type i) const
   while (i < start_indices[block])
     --block;
 
-  return std::pair<size_type,size_type>(block,
-                                        i-start_indices[block]);
+  return std::pair<unsigned int,size_type>(block,
+                                           i-start_indices[block]);
 }
 
 

diff --git a/include/deal.II/lac/block_vector_base.h b/include/deal.II/lac/block_vector_base.h
index b4acb3fa16fc7cdd85bf05a93f3b2a53721c0f81..6aed46afdf86cf980149e8d40adca8bddb199ae5 100644 (file)
--- a/include/deal.II/lac/block_vector_base.h
+++ b/include/deal.II/lac/block_vector_base.h
@@ -2170,7 +2170,7 @@ inline
 typename BlockVectorBase<VectorType>::value_type
 BlockVectorBase<VectorType>::operator() (const size_type i) const
 {
-  const std::pair<size_type,size_type> local_index
+  const std::pair<unsigned int,size_type> local_index
     = block_indices.global_to_local (i);
   return components[local_index.first](local_index.second);
 }
@@ -2182,7 +2182,7 @@ inline
 typename BlockVectorBase<VectorType>::reference
 BlockVectorBase<VectorType>::operator() (const size_type i)
 {
-  const std::pair<size_type,size_type> local_index
+  const std::pair<unsigned int,size_type> local_index
     = block_indices.global_to_local (i);
   return components[local_index.first](local_index.second);
 }