From: Ralf Hartmann <Ralf.Hartmann@dlr.de>
Date: Wed, 11 Jul 2001 11:04:11 +0000 (+0000)
Subject: Derive all PreconditionBlock* class virtually from Subscriptor. This allows also... 
X-Git-Tag: v8.0.0~18959
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c69e6482ba5cb9ea5a0bc07d2d246558d59fddaa;p=dealii.git

Derive all PreconditionBlock* class virtually from Subscriptor. This allows also PreconditionBlockSSOR to be derived from Subscriptor. Use of virtual derivation to avoid ambiguity.


git-svn-id: https://svn.dealii.org/trunk@4839 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/lac/include/lac/precondition_block.h b/deal.II/lac/include/lac/precondition_block.h
index 74e82735f1..9be09e0af7 100644
--- a/deal.II/lac/include/lac/precondition_block.h
+++ b/deal.II/lac/include/lac/precondition_block.h
@@ -75,7 +75,7 @@ template <typename number> class Vector;
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000
  */
 template<typename number, typename inverse_type = number>
-class PreconditionBlock
+class PreconditionBlock : public virtual Subscriptor
 {
   public:
 				     /**
@@ -293,7 +293,7 @@ class PreconditionBlock
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000
  */
 template<typename number, typename inverse_type = number>
-class PreconditionBlockJacobi : public Subscriptor,
+class PreconditionBlockJacobi : public virtual Subscriptor,
 				private PreconditionBlock<number,inverse_type>
 {
   public:
@@ -354,7 +354,7 @@ class PreconditionBlockJacobi : public Subscriptor,
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000
  */
 template<typename number, typename inverse_type = number>
-class PreconditionBlockSOR : public  Subscriptor,
+class PreconditionBlockSOR : public virtual Subscriptor,
 			     protected PreconditionBlock<number,inverse_type>
 {
   public:
@@ -417,7 +417,8 @@ class PreconditionBlockSOR : public  Subscriptor,
  * @author Ralf Hartmann, Guido Kanschat, 1999, 2000
  */
 template<typename number, typename inverse_type = number>
-class PreconditionBlockSSOR : private PreconditionBlockSOR<number,inverse_type>
+class PreconditionBlockSSOR : public virtual Subscriptor,
+			      private PreconditionBlockSOR<number,inverse_type>
 {
   public:
 				     /**