From: bangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 13 Jul 2010 13:55:49 +0000 (+0000)
Subject: Take over patch 21490 from mainline.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af9c59fe54a8ad87f6c2b434954cc7394b1d8cb2;p=dealii-svn.git

Take over patch 21490 from mainline.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-6-3@21491 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 2934e9e9e0..4ac9f84287 100644
--- a/deal.II/lac/include/lac/precondition_block.h
+++ b/deal.II/lac/include/lac/precondition_block.h
@@ -1017,43 +1017,43 @@ class PreconditionBlockSSOR : public virtual Subscriptor,
 				     /**
 				      * Make type publicly available.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::AdditionalData;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::AdditionalData;
 
 				     /**
 				      * Make initialization function
 				      * publicly available.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::initialize;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::initialize;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::clear;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::clear;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::set_permutation;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::set_permutation;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX, inverse_type>::empty;
+    using PreconditionBlockSOR<MATRIX, inverse_type>::empty;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX, inverse_type>::el;
+    using PreconditionBlockSOR<MATRIX, inverse_type>::el;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::set_same_diagonal;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::set_same_diagonal;
 
 				     /**
 				      * Make function of base class public again.
 				      */
-    PreconditionBlockSOR<MATRIX,inverse_type>::invert_diagblocks;
+    using PreconditionBlockSOR<MATRIX,inverse_type>::invert_diagblocks;
 
 				     /**
 				      * Execute block SSOR