From 6e178f4fd28b77fa67c0366674c536f887597ac9 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 21 Aug 2011 00:42:52 +0000 Subject: [PATCH] Use new-style using declarations. git-svn-id: https://svn.dealii.org/trunk@24139 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/deal.II/lac/precondition_block.h | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/deal.II/include/deal.II/lac/precondition_block.h b/deal.II/include/deal.II/lac/precondition_block.h index 45e094b58e..a8a666a36a 100644 --- a/deal.II/include/deal.II/lac/precondition_block.h +++ b/deal.II/include/deal.II/lac/precondition_block.h @@ -427,7 +427,7 @@ class PreconditionBlock * used by derived classes. */ double relaxation; - + /** * The permutation vector */ @@ -763,7 +763,7 @@ class PreconditionBlockSOR : public virtual Subscriptor, * Default constructor. */ PreconditionBlockSOR(); - + /** * Define number type of matrix. */ @@ -773,17 +773,17 @@ class PreconditionBlockSOR : public virtual Subscriptor, * import types and functions from protected base class. */ using typename PreconditionBlock::AdditionalData; - using typename PreconditionBlock::initialize; - using typename PreconditionBlock::clear; - using typename PreconditionBlock::empty; - using typename PreconditionBlockBase::size; - using typename PreconditionBlockBase::inverse; - using typename PreconditionBlockBase::inverse_householder; - using typename PreconditionBlockBase::inverse_svd; - using typename PreconditionBlock::el; - using typename PreconditionBlock::set_same_diagonal; - using typename PreconditionBlock::invert_diagblocks; - using typename PreconditionBlock::set_permutation; + using PreconditionBlock::initialize; + using PreconditionBlock::clear; + using PreconditionBlock::empty; + using PreconditionBlockBase::size; + using PreconditionBlockBase::inverse; + using PreconditionBlockBase::inverse_householder; + using PreconditionBlockBase::inverse_svd; + using PreconditionBlock::el; + using PreconditionBlock::set_same_diagonal; + using PreconditionBlock::invert_diagblocks; + using PreconditionBlock::set_permutation; /** * Execute block SOR @@ -881,7 +881,7 @@ class PreconditionBlockSOR : public virtual Subscriptor, * PreconditionBlockSSOR. */ PreconditionBlockSOR(bool store); - + /** * Implementation of the forward * substitution loop called by @@ -957,7 +957,7 @@ class PreconditionBlockSSOR : public virtual Subscriptor, PreconditionBlockSSOR (); // Keep AdditionalData accessible - PreconditionBlockSOR::AdditionalData; + using typename PreconditionBlockSOR::AdditionalData; // The following are the // functions of the base classes @@ -967,17 +967,17 @@ class PreconditionBlockSSOR : public virtual Subscriptor, * Make initialization function * publicly available. */ - PreconditionBlockSOR::initialize; - PreconditionBlockSOR::clear; - PreconditionBlockBase::size; - PreconditionBlockBase::inverse; - PreconditionBlockBase::inverse_householder; - PreconditionBlockBase::inverse_svd; - PreconditionBlockSOR::set_permutation; - PreconditionBlockSOR::empty; - PreconditionBlockSOR::el; - PreconditionBlockSOR::set_same_diagonal; - PreconditionBlockSOR::invert_diagblocks; + using PreconditionBlockSOR::initialize; + using PreconditionBlockSOR::clear; + using PreconditionBlockBase::size; + using PreconditionBlockBase::inverse; + using PreconditionBlockBase::inverse_householder; + using PreconditionBlockBase::inverse_svd; + using PreconditionBlockSOR::set_permutation; + using PreconditionBlockSOR::empty; + using PreconditionBlockSOR::el; + using PreconditionBlockSOR::set_same_diagonal; + using PreconditionBlockSOR::invert_diagblocks; /** * Execute block SSOR -- 2.39.5