From: Rene Gassmoeller <R.Gassmoeller@mailbox.org>
Date: Fri, 25 Sep 2015 10:44:19 +0000 (+0200)
Subject: Fix type mismatch in block vector
X-Git-Tag: v8.4.0-rc2~368^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1672%2Fhead;p=dealii.git

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 d1022a3d5d..539611ff6b 100644
--- 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 b4acb3fa16..6aed46afdf 100644
--- 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);
 }