Skip to content

Commit

Permalink
Merge pull request #12749 from bangerth/size_type
Browse files Browse the repository at this point in the history
Consistently declare size_type in preconditioners derived from PreconditionRelaxation.
  • Loading branch information
drwells committed Sep 8, 2021
2 parents d4088db + 7c160dc commit 8abf4cb
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions include/deal.II/lac/precondition.h
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,11 @@ template <typename MatrixType = SparseMatrix<double>>
class PreconditionJacobi : public PreconditionRelaxation<MatrixType>
{
public:
/**
* Declare type for container size.
*/
using size_type = typename PreconditionRelaxation<MatrixType>::size_type;

/**
* An alias to the base class AdditionalData.
*/
Expand Down Expand Up @@ -583,6 +588,11 @@ template <typename MatrixType = SparseMatrix<double>>
class PreconditionSOR : public PreconditionRelaxation<MatrixType>
{
public:
/**
* Declare type for container size.
*/
using size_type = typename PreconditionRelaxation<MatrixType>::size_type;

/**
* An alias to the base class AdditionalData.
*/
Expand Down Expand Up @@ -651,15 +661,15 @@ class PreconditionSSOR : public PreconditionRelaxation<MatrixType>
{
public:
/**
* An alias to the base class AdditionalData.
* Declare type for container size.
*/
using AdditionalData =
typename PreconditionRelaxation<MatrixType>::AdditionalData;
using size_type = typename PreconditionRelaxation<MatrixType>::size_type;

/**
* Declare type for container size.
* An alias to the base class AdditionalData.
*/
using size_type = typename MatrixType::size_type;
using AdditionalData =
typename PreconditionRelaxation<MatrixType>::AdditionalData;

/**
* An alias to the base class.
Expand Down Expand Up @@ -752,7 +762,7 @@ class PreconditionPSOR : public PreconditionRelaxation<MatrixType>
/**
* Declare type for container size.
*/
using size_type = typename MatrixType::size_type;
using size_type = typename PreconditionRelaxation<MatrixType>::size_type;

/**
* Parameters for PreconditionPSOR.
Expand Down

0 comments on commit 8abf4cb

Please sign in to comment.