From 1bed52d07f144729b4d6094db9fc16f4e8bdb7fd Mon Sep 17 00:00:00 2001 From: heister Date: Sun, 21 Aug 2011 00:21:40 +0000 Subject: [PATCH] use using. git-svn-id: https://svn.dealii.org/trunk@24132 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/precondition_block.h | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/deal.II/include/deal.II/lac/precondition_block.h b/deal.II/include/deal.II/lac/precondition_block.h index e47e583206..c28c23d2f6 100644 --- 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::initialize; - PreconditionBlock::clear; - PreconditionBlock::empty; - PreconditionBlock::el; - PreconditionBlock::set_same_diagonal; - PreconditionBlock::invert_diagblocks; - PreconditionBlock::block_size; - PreconditionBlockBase::size; - PreconditionBlockBase::inverse; - PreconditionBlockBase::inverse_householder; - PreconditionBlockBase::inverse_svd; + /** + * import functions from private base class + */ + using PreconditionBlock::initialize; + using PreconditionBlock::clear; + using PreconditionBlock::empty; + using PreconditionBlock::el; + using PreconditionBlock::set_same_diagonal; + using PreconditionBlock::invert_diagblocks; + using PreconditionBlock::block_size; + using PreconditionBlockBase::size; + using PreconditionBlockBase::inverse; + using PreconditionBlockBase::inverse_householder; + using PreconditionBlockBase::inverse_svd; /** * @deprecated Use size() instead */ - PreconditionBlock::n_blocks; - PreconditionBlock::set_permutation; + using PreconditionBlock::n_blocks; + using PreconditionBlock::set_permutation; /** * Execute block Jacobi -- 2.39.5