From: hartmann <hartmann@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Fri, 17 Aug 2007 12:46:27 +0000 (+0000)
Subject: Make it compile with Sun C++ 5.9. Avoid error: cannot change access of BlockSparsityP... 
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=665dd077e527574f815db28522d97fcfe10d6e81;p=dealii-svn.git

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
---

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<Compresse
 				      */
     void reinit (const std::vector< unsigned int > &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<CompressedSparsityPattern>::reinit;
 };
 
 
@@ -709,13 +702,6 @@ class BlockCompressedSetSparsityPattern : public BlockSparsityPatternBase<Compre
 				      */
     void reinit (const std::vector< unsigned int > &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<CompressedSetSparsityPattern>::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<CompressedSparsityPattern>::reinit(row_block_sizes.size(), col_block_sizes.size());
   for (unsigned int i=0;i<row_block_sizes.size();++i)
     for (unsigned int j=0;j<col_block_sizes.size();++j)
       this->block(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<CompressedSetSparsityPattern>::reinit(row_block_sizes.size(), col_block_sizes.size());
   for (unsigned int i=0;i<row_block_sizes.size();++i)
     for (unsigned int j=0;j<col_block_sizes.size();++j)
       this->block(i,j).reinit(row_block_sizes[i],col_block_sizes[j]);