From 665dd077e527574f815db28522d97fcfe10d6e81 Mon Sep 17 00:00:00 2001 From: hartmann Date: Fri, 17 Aug 2007 12:46:27 +0000 Subject: [PATCH] Make it compile with Sun C++ 5.9. Avoid error: cannot change access of BlockSparsityPatternBase::reinit. git-svn-id: https://svn.dealii.org/trunk@14965 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/block_sparsity_pattern.h | 14 -------------- deal.II/lac/source/block_sparsity_pattern.cc | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/deal.II/lac/include/lac/block_sparsity_pattern.h b/deal.II/lac/include/lac/block_sparsity_pattern.h index 5da1bc75e2..f8b1a4d9c5 100644 --- a/deal.II/lac/include/lac/block_sparsity_pattern.h +++ b/deal.II/lac/include/lac/block_sparsity_pattern.h @@ -617,13 +617,6 @@ class BlockCompressedSparsityPattern : public BlockSparsityPatternBase &row_block_sizes, const std::vector< unsigned int > &col_block_sizes); - - /** - * Allow the use of the reinit - * functions of the base class as - * well. - */ - BlockSparsityPatternBase::reinit; }; @@ -709,13 +702,6 @@ class BlockCompressedSetSparsityPattern : public BlockSparsityPatternBase &row_block_sizes, const std::vector< unsigned int > &col_block_sizes); - - /** - * Allow the use of the reinit - * functions of the base class as - * well. - */ - BlockSparsityPatternBase::reinit; }; diff --git a/deal.II/lac/source/block_sparsity_pattern.cc b/deal.II/lac/source/block_sparsity_pattern.cc index 7968812b9f..17e03f2e6b 100644 --- a/deal.II/lac/source/block_sparsity_pattern.cc +++ b/deal.II/lac/source/block_sparsity_pattern.cc @@ -425,7 +425,7 @@ BlockCompressedSparsityPattern::reinit ( const std::vector< unsigned int > &row_block_sizes, const std::vector< unsigned int > &col_block_sizes) { - this->reinit(row_block_sizes.size(), col_block_sizes.size()); + BlockSparsityPatternBase::reinit(row_block_sizes.size(), col_block_sizes.size()); for (unsigned int i=0;iblock(i,j).reinit(row_block_sizes[i],col_block_sizes[j]); @@ -467,7 +467,7 @@ BlockCompressedSetSparsityPattern::reinit ( const std::vector< unsigned int > &row_block_sizes, const std::vector< unsigned int > &col_block_sizes) { - this->reinit(row_block_sizes.size(), col_block_sizes.size()); + BlockSparsityPatternBase::reinit(row_block_sizes.size(), col_block_sizes.size()); for (unsigned int i=0;iblock(i,j).reinit(row_block_sizes[i],col_block_sizes[j]); -- 2.39.5