From 3797595e28db172d18acd9050786d325db87e45b Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 25 Sep 2015 12:44:19 +0200 Subject: [PATCH] Fix type mismatch in block vector --- include/deal.II/lac/block_indices.h | 4 ++-- include/deal.II/lac/block_vector_base.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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(block, - i-start_indices[block]); + return std::pair(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::value_type BlockVectorBase::operator() (const size_type i) const { - const std::pair local_index + const std::pair local_index = block_indices.global_to_local (i); return components[local_index.first](local_index.second); } @@ -2182,7 +2182,7 @@ inline typename BlockVectorBase::reference BlockVectorBase::operator() (const size_type i) { - const std::pair local_index + const std::pair local_index = block_indices.global_to_local (i); return components[local_index.first](local_index.second); } -- 2.39.5