Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistently declare size_type in preconditioners derived from PreconditionRelaxation. #12749

Merged
merged 1 commit into from
Sep 8, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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