From 32baa34b2da18d2c85069f7596c5386d002074a6 Mon Sep 17 00:00:00 2001
From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Thu, 16 Aug 2001 11:35:49 +0000
Subject: [PATCH] Previously, the preconditioners using matrices, derived
 privately from PreconditionRelaxation, but introduced the only function of
 the base class later on explicitely into the public area. Since private
 inheritance interferes with the use of the Subscriptor class in the base
 class (we can't cast to it any more), change the inheritance to public and
 remove the explicit "using" declarations.

git-svn-id: https://svn.dealii.org/trunk@4892 0785d39b-7218-0410-832d-ea1e28bc413d
---
 deal.II/lac/include/lac/precondition.h | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/deal.II/lac/include/lac/precondition.h b/deal.II/lac/include/lac/precondition.h
index 919905cddb..489c4a5ec8 100644
--- a/deal.II/lac/include/lac/precondition.h
+++ b/deal.II/lac/include/lac/precondition.h
@@ -204,7 +204,7 @@ class PreconditionRelaxation : public Subscriptor
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionJacobi : public Subscriptor, private PreconditionRelaxation<MATRIX>
+class PreconditionJacobi : public PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -221,12 +221,6 @@ class PreconditionJacobi : public Subscriptor, private PreconditionRelaxation<MA
 				      */
     template<class VECTOR>
     void Tvmult (VECTOR&, const VECTOR&) const;
-
-				     /**
-				      * Make function of base class
-				      * publicly available.
-				      */
-    PreconditionRelaxation<MATRIX>::initialize;
 };
 
 
@@ -259,7 +253,7 @@ class PreconditionJacobi : public Subscriptor, private PreconditionRelaxation<MA
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionSOR : public Subscriptor, private PreconditionRelaxation<MATRIX>
+class PreconditionSOR : public PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -274,12 +268,6 @@ class PreconditionSOR : public Subscriptor, private PreconditionRelaxation<MATRI
 				      */
     template<class VECTOR>
     void Tvmult (VECTOR&, const VECTOR&) const;
-
-				     /**
-				      * Make function of base class
-				      * publicly available.
-				      */
-    PreconditionRelaxation<MATRIX>::initialize;
 };
 
 
@@ -312,7 +300,7 @@ class PreconditionSOR : public Subscriptor, private PreconditionRelaxation<MATRI
  * @author Guido Kanschat, 2000
  */
 template <class MATRIX = SparseMatrix<double> >
-class PreconditionSSOR : public Subscriptor, private PreconditionRelaxation<MATRIX>
+class PreconditionSSOR : public PreconditionRelaxation<MATRIX>
 {
   public:
 				     /**
@@ -330,12 +318,6 @@ class PreconditionSSOR : public Subscriptor, private PreconditionRelaxation<MATR
 				      */
     template<class VECTOR>
     void Tvmult (VECTOR&, const VECTOR&) const;
-
-				     /**
-				      * Make function of base class
-				      * publicly available.
-				      */
-    PreconditionRelaxation<MATRIX>::initialize;
 };
 
 
-- 
2.39.5