use using.

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

diff --git a/deal.II/include/deal.II/lac/precondition_block.h b/deal.II/include/deal.II/lac/precondition_block.h
index e47e583206539d2d697dfb59f6de91a85e9ace1f..c28c23d2f6942397fedf1dd96076d4d4c616b255 100644 (file)
--- a/deal.II/include/deal.II/lac/precondition_block.h
+++ b/deal.II/include/deal.II/lac/precondition_block.h
@@ -599,22 +599,25 @@ class PreconditionBlockJacobi : public virtual Subscriptor,
         Accessor accessor;
     };
 
-    PreconditionBlock<MATRIX, inverse_type>::initialize;
-    PreconditionBlock<MATRIX, inverse_type>::clear;
-    PreconditionBlock<MATRIX, inverse_type>::empty;
-    PreconditionBlock<MATRIX, inverse_type>::el;
-    PreconditionBlock<MATRIX, inverse_type>::set_same_diagonal;
-    PreconditionBlock<MATRIX, inverse_type>::invert_diagblocks;
-    PreconditionBlock<MATRIX, inverse_type>::block_size;
-    PreconditionBlockBase<inverse_type>::size;
-    PreconditionBlockBase<inverse_type>::inverse;
-    PreconditionBlockBase<inverse_type>::inverse_householder;
-    PreconditionBlockBase<inverse_type>::inverse_svd;
+                                    /**
+                                     * import functions from private base class
+                                     */
+    using PreconditionBlock<MATRIX, inverse_type>::initialize;
+    using PreconditionBlock<MATRIX, inverse_type>::clear;
+    using PreconditionBlock<MATRIX, inverse_type>::empty;
+    using PreconditionBlock<MATRIX, inverse_type>::el;
+    using PreconditionBlock<MATRIX, inverse_type>::set_same_diagonal;
+    using PreconditionBlock<MATRIX, inverse_type>::invert_diagblocks;
+    using PreconditionBlock<MATRIX, inverse_type>::block_size;
+    using PreconditionBlockBase<inverse_type>::size;
+    using PreconditionBlockBase<inverse_type>::inverse;
+    using PreconditionBlockBase<inverse_type>::inverse_householder;
+    using PreconditionBlockBase<inverse_type>::inverse_svd;
                                     /**
                                      * @deprecated Use size() instead
                                      */
-    PreconditionBlock<MATRIX, inverse_type>::n_blocks;
-    PreconditionBlock<MATRIX, inverse_type>::set_permutation;
+    using PreconditionBlock<MATRIX, inverse_type>::n_blocks;
+    using PreconditionBlock<MATRIX, inverse_type>::set_permutation;
 
                                     /**
                                      * Execute block Jacobi